From patchwork Tue Jan 16 16:25:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mary Bennett X-Patchwork-Id: 84190 X-Patchwork-Delegate: jlaw@ventanamicro.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE202386183A for ; Tue, 16 Jan 2024 16:26:49 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id F00AA3857733 for ; Tue, 16 Jan 2024 16:26:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F00AA3857733 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F00AA3857733 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::331 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705422376; cv=none; b=jlOJUnpQAGYAGV69i/EVRxnhTPvBbns7/5fWpk39AYSifGfpdy7/NP3R0TxRHyCnAOFlE3RrCNZcBEJc+UoHJ7Fla+vFx0STFGU/T3v6q3Wr8JvFszV4D9baEgJux6RUCng7RCWWcZ5Lro2IC5vOl/2dj9lF8lvAFR+mFy9sLqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705422376; c=relaxed/simple; bh=RHYaj0WONxodzFbJEdRr36zJ0q9REFKhnq7nTQ36zck=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=moOg/3qnaqqdXY27kZM2hKmNUjbRpypbYgloTbAGHjJXwhOGLUpXT4+ieOwqURK//KWALFqdaPrNCCFaPgZs36KINTlZaQwKQzVnQOegseX8UKN8ziHTcyWYH96sdsO05+KE5iBQqW4iZaijatwNs02R51tdtnWbEgCdUBXCKls= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40e86a9fbd9so4289385e9.1 for ; Tue, 16 Jan 2024 08:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1705422367; x=1706027167; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J+dd6Ihw4o7e5I8/D/9P6+JRpaeBKKlvt9F9jm6KNxo=; b=FlKpvh1MFnftWWnXh4WEVeKx4QX9cfRd/6uKji8uLxbiSq+oxOgsQQ6FXF2pjiLmat ALRM7jDBMrwGM6AFMc+3PQMzE8PggpisI3NyjpJuFCZ0ZHgBXwnAgnSuZaStNtdDp4uV 17A39SKOGpjvmO3PvDkBjCVQKazGHZrpEg/MsMs0Y/Pfe6cs1Zt+Ce9OCT+gejZqicgn oZKd0Zva89T4Q8Bllhyp9pWUvwEM8qJnoXE1dWd5ta1FDRDRpmIU/cR0WuA9AQp6+WbZ TZovjh+v1xe4jQwBDYa+xTcGI/OfdyEMotp3wbwRlfcbOi5tIzGraThmec41SAORPCrx 4+Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705422367; x=1706027167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J+dd6Ihw4o7e5I8/D/9P6+JRpaeBKKlvt9F9jm6KNxo=; b=SvNrrBYh1eXFL8QDgcXX5/g37Big+udUqIvVT4IjIYOLeE/6MYVPqQzj4QUgwmrdum s2mfuMY2Jql/ZzMa+6LhrIjrmMGgBK8A0Kxw16bQEA6Nn2mRbTeYbWzk5PLsQsHmblHt k6SpE3RnPfglyBmBpIPf3flp71JOqS1myTcyzXmsdNM8oe7VG7Q8VfDiSMSrcGDOtgDj g630pYKaOVy7xwFyYQ3jH6HuNpZbAWYIhKRaoARpCc0GxF7GrC37RRJY1w7waOcD2fpd 21HaMr2gPpS2HiwVWgN34pZcSd2jH6pJH1wz9WIn6FKRe5yLQ+KqfKldaj8MSIx7qMFc DUIQ== X-Gm-Message-State: AOJu0YxupH/1IMRhqjcr5IwQtPjlisGYJ6wBiFVOC+4CDrPoknpGUpVU FgIWzf68+V8vipBSsnFeeISCawN9qeuSLCROkqEl19WSfY0= X-Google-Smtp-Source: AGHT+IGqFFKDIWqmC1AdYzPheEInIsQqN65GqJkiSqcNm+a0p9/4s8wEVIoKrbjWkCK1CSh8cXfeYQ== X-Received: by 2002:a7b:c8c3:0:b0:40e:7d37:5fed with SMTP id f3-20020a7bc8c3000000b0040e7d375fedmr1625606wml.78.1705422366586; Tue, 16 Jan 2024 08:26:06 -0800 (PST) Received: from troughton.lym.embecosm-corp.com ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id m26-20020a7bca5a000000b0040e54381a85sm19170074wml.26.2024.01.16.08.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 08:26:05 -0800 (PST) From: Mary Bennett To: gcc-patches@gcc.gnu.org Cc: mary.bennett@embecosm.com Subject: [PATCH v2 1/1] RISC-V: Add support for XCVbitmanip extension in CV32E40P Date: Tue, 16 Jan 2024 16:25:52 +0000 Message-Id: <20240116162552.461635-2-mary.bennett@embecosm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240116162552.461635-1-mary.bennett@embecosm.com> References: <20231109105542.4013483-1-mary.bennett@embecosm.com^Cthread> <20240116162552.461635-1-mary.bennett@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Spec: github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-builtin-spec.md Contributors: Mary Bennett Nandni Jamnadas Pietra Ferreira Charlie Keaney Jessica Mills Craig Blackmore Simon Cook Jeremy Bennett Helene Chelin gcc/ChangeLog: * common/config/riscv/riscv-common.cc: Add XCVbitmanip. * config/riscv/constraints.md: Likewise. * config/riscv/corev.def: Likewise. * config/riscv/corev.md: Likewise. * config/riscv/predicates.md: Likewise. * config/riscv/riscv-builtins.cc (AVAIL): Likewise. * config/riscv/riscv-ftypes.def: Likewise. * config/riscv/riscv.opt: Likewise. * doc/extend.texi: Add XCVbitmanip builtin documentation. * doc/sourcebuild.texi: Likewise. gcc/testsuite/ChangeLog: * gcc.target/riscv/cv-bitmanip-compile-bclr.c: New test. * gcc.target/riscv/cv-bitmanip-compile-bclrr.c: New test. * gcc.target/riscv/cv-bitmanip-compile-bitrev.c: New test. * gcc.target/riscv/cv-bitmanip-compile-bset.c: New test. * gcc.target/riscv/cv-bitmanip-compile-bsetr.c: New test. * gcc.target/riscv/cv-bitmanip-compile-clb.c: New test. * gcc.target/riscv/cv-bitmanip-compile-cnt.c: New test. * gcc.target/riscv/cv-bitmanip-compile-extract.c: New test. * gcc.target/riscv/cv-bitmanip-compile-extractr.c: New test. * gcc.target/riscv/cv-bitmanip-compile-extractu.c: New test. * gcc.target/riscv/cv-bitmanip-compile-extractur.c: New test. * gcc.target/riscv/cv-bitmanip-compile-ff1.c: New test. * gcc.target/riscv/cv-bitmanip-compile-fl1.c: New test. * gcc.target/riscv/cv-bitmanip-compile-insert.c: New test. * gcc.target/riscv/cv-bitmanip-compile-insertr.c: New test. * gcc.target/riscv/cv-bitmanip-compile-ror.c: New test. * gcc.target/riscv/cv-bitmanip-fail-compile-bclr.c: New test. * gcc.target/riscv/cv-bitmanip-fail-compile-bitrev.c: New test. * gcc.target/riscv/cv-bitmanip-fail-compile-bset.c: New test. * gcc.target/riscv/cv-bitmanip-fail-compile-extract.c: New test. * gcc.target/riscv/cv-bitmanip-fail-compile-extractu.c: New test. * gcc.target/riscv/cv-bitmanip-fail-compile-insert.c: New test. * lib/target-supports.exp: Add proc for the XCVbitmanip extension. --- gcc/common/config/riscv/riscv-common.cc | 2 + gcc/config/riscv/constraints.md | 16 ++ gcc/config/riscv/corev.def | 13 ++ gcc/config/riscv/corev.md | 164 ++++++++++++++++++ gcc/config/riscv/predicates.md | 16 ++ gcc/config/riscv/riscv-builtins.cc | 1 + gcc/config/riscv/riscv-ftypes.def | 5 + gcc/config/riscv/riscv.cc | 13 ++ gcc/config/riscv/riscv.opt | 2 + gcc/doc/extend.texi | 53 ++++++ gcc/doc/sourcebuild.texi | 3 + .../riscv/cv-bitmanip-compile-bclr.c | 27 +++ .../riscv/cv-bitmanip-compile-bclrr.c | 18 ++ .../riscv/cv-bitmanip-compile-bitrev.c | 30 ++++ .../riscv/cv-bitmanip-compile-bset.c | 27 +++ .../riscv/cv-bitmanip-compile-bsetr.c | 18 ++ .../riscv/cv-bitmanip-compile-clb.c | 18 ++ .../riscv/cv-bitmanip-compile-cnt.c | 18 ++ .../riscv/cv-bitmanip-compile-extract.c | 27 +++ .../riscv/cv-bitmanip-compile-extractr.c | 18 ++ .../riscv/cv-bitmanip-compile-extractu.c | 27 +++ .../riscv/cv-bitmanip-compile-extractur.c | 18 ++ .../riscv/cv-bitmanip-compile-ff1.c | 18 ++ .../riscv/cv-bitmanip-compile-fl1.c | 18 ++ .../riscv/cv-bitmanip-compile-insert.c | 24 +++ .../riscv/cv-bitmanip-compile-insertr.c | 18 ++ .../riscv/cv-bitmanip-compile-ror.c | 18 ++ .../riscv/cv-bitmanip-fail-compile-bclr.c | 25 +++ .../riscv/cv-bitmanip-fail-compile-bitrev.c | 23 +++ .../riscv/cv-bitmanip-fail-compile-bset.c | 25 +++ .../riscv/cv-bitmanip-fail-compile-extract.c | 25 +++ .../riscv/cv-bitmanip-fail-compile-extractu.c | 25 +++ .../riscv/cv-bitmanip-fail-compile-insert.c | 25 +++ gcc/testsuite/lib/target-supports.exp | 13 ++ 34 files changed, 791 insertions(+) create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclr.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclrr.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bitrev.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bset.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bsetr.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-clb.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-cnt.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extract.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractr.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractu.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractur.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ff1.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-fl1.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insert.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insertr.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ror.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bclr.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bitrev.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bset.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extract.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extractu.c create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-insert.c diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index 0301d170a41..9e7808b8014 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -355,6 +355,7 @@ static const struct riscv_ext_version riscv_ext_version_table[] = {"xcvmac", ISA_SPEC_CLASS_NONE, 1, 0}, {"xcvalu", ISA_SPEC_CLASS_NONE, 1, 0}, {"xcvelw", ISA_SPEC_CLASS_NONE, 1, 0}, + {"xcvbitmanip", ISA_SPEC_CLASS_NONE, 1, 0}, {"xtheadba", ISA_SPEC_CLASS_NONE, 1, 0}, {"xtheadbb", ISA_SPEC_CLASS_NONE, 1, 0}, @@ -1730,6 +1731,7 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] = {"xcvmac", &gcc_options::x_riscv_xcv_subext, MASK_XCVMAC}, {"xcvalu", &gcc_options::x_riscv_xcv_subext, MASK_XCVALU}, {"xcvelw", &gcc_options::x_riscv_xcv_subext, MASK_XCVELW}, + {"xcvbitmanip", &gcc_options::x_riscv_xcv_subext, MASK_XCVBITMANIP}, {"xtheadba", &gcc_options::x_riscv_xthead_subext, MASK_XTHEADBA}, {"xtheadbb", &gcc_options::x_riscv_xthead_subext, MASK_XTHEADBB}, diff --git a/gcc/config/riscv/constraints.md b/gcc/config/riscv/constraints.md index ee1c12b2e51..8923bd431ce 100644 --- a/gcc/config/riscv/constraints.md +++ b/gcc/config/riscv/constraints.md @@ -103,6 +103,11 @@ (and (match_code "const_int") (match_test "SINGLE_BIT_MASK_OPERAND (~ival)"))) +(define_constraint "D03" + "@internal + 0, 1, 2 or 3 immediate" + (match_test "IN_RANGE (ival, 0, 3)")) + ;; Floating-point constant +0.0, used for FCVT-based moves when FMV is ;; not available in RV32. (define_constraint "G" @@ -262,3 +267,14 @@ (and (match_code "const_int") (and (match_test "IN_RANGE (ival, 0, 1073741823)") (match_test "exact_log2 (ival + 1) != -1")))) + +(define_constraint "CV_bit_si10" + "A 10-bit unsigned immediate for CORE-V bitmanip." + (and (match_code "const_int") + (match_test "IN_RANGE (ival, 0, 1023)"))) + +(define_constraint "CV_bit_in10" + "A 10-bit unsigned immediate for CORE-V bitmanip insert." + (and (match_code "const_int") + (and (match_test "IN_RANGE (ival, 0, 1023)") + (match_test "(ival & 31) + ((ival >> 5) & 31) <= 32")))) diff --git a/gcc/config/riscv/corev.def b/gcc/config/riscv/corev.def index 3b9ec029d06..509f33b98f8 100644 --- a/gcc/config/riscv/corev.def +++ b/gcc/config/riscv/corev.def @@ -44,3 +44,16 @@ RISCV_BUILTIN (cv_alu_subuRN, "cv_alu_subuRN",RISCV_BUILTIN_DIRECT, RISCV_USI_ // XCVELW RISCV_BUILTIN (cv_elw_elw_si, "cv_elw_elw", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_VOID_PTR, cvelw), + +// XCVBITMANIP +RISCV_BUILTIN (cv_bitmanip_extract, "cv_bitmanip_extract", RISCV_BUILTIN_DIRECT, RISCV_SI_FTYPE_USI_UHI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_extractu, "cv_bitmanip_extractu", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_USI_UHI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_insert, "cv_bitmanip_insert", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_USI_UHI_USI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_bclr, "cv_bitmanip_bclr", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_USI_UHI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_bset, "cv_bitmanip_bset", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_USI_UHI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_ff1, "cv_bitmanip_ff1", RISCV_BUILTIN_DIRECT, RISCV_UQI_FTYPE_USI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_fl1, "cv_bitmanip_fl1", RISCV_BUILTIN_DIRECT, RISCV_UQI_FTYPE_USI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_clb, "cv_bitmanip_clb", RISCV_BUILTIN_DIRECT, RISCV_UQI_FTYPE_USI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_cnt, "cv_bitmanip_cnt", RISCV_BUILTIN_DIRECT, RISCV_UQI_FTYPE_USI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_ror, "cv_bitmanip_ror", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_USI_USI, cvbitmanip), +RISCV_BUILTIN (cv_bitmanip_bitrev, "cv_bitmanip_bitrev", RISCV_BUILTIN_DIRECT, RISCV_USI_FTYPE_USI_UQI_UQI, cvbitmanip), diff --git a/gcc/config/riscv/corev.md b/gcc/config/riscv/corev.md index adad2409fb6..9afd69ec080 100644 --- a/gcc/config/riscv/corev.md +++ b/gcc/config/riscv/corev.md @@ -27,6 +27,10 @@ ;;CORE-V EVENT LOAD UNSPECV_CV_ELW + + ;;CORE-V BITMANIP + UNSPEC_CV_BITMANIP_BITREV + UNSPEC_CV_BITMANIP_FL1 ]) ;; XCVMAC extension. @@ -706,3 +710,163 @@ [(set_attr "type" "load") (set_attr "mode" "SI")]) + +;; XCVBITMANIP builtins + +(define_insn "riscv_cv_bitmanip_extract" + [(set (match_operand:SI 0 "register_operand" "=r,r") + (sign_extend:SI (and:SI (rotate:SI (ashift:SI (const_int 1) + (ashiftrt:HI + (match_operand:HI 2 "bit_extract_operand" "CV_bit_si10,r") + (const_int 5))) + (and:HI (match_dup 2) + (const_int 31))) + (match_operand:SI 1 "register_operand" "r,r"))))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "@ + cv.extract\t%0,%1,%Z2,%Y2 + cv.extractr\t%0,%1,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_extractu" + [(set (match_operand:SI 0 "register_operand" "=r,r") + (zero_extend:SI (and:SI (rotate:SI (ashift:SI (const_int 1) + (ashiftrt:HI + (match_operand:HI 2 "bit_extract_operand" "CV_bit_si10,r") + (const_int 5))) + (and:HI (match_dup 2) + (const_int 31))) + (match_operand:SI 1 "register_operand" "r,r"))))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "@ + cv.extractu\t%0,%1,%Z2,%Y2 + cv.extractur\t%0,%1,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_insert" + [(set (match_operand:SI 0 "register_operand" "=r,r") + (plus:SI (and:SI + (rotate:SI (ashift:SI (const_int -2) + (ashiftrt:HI + (match_operand:HI 2 "bit_extract_operand" "CV_bit_si10,r") + (const_int 5))) + (and:HI (match_dup 2) + (const_int 31))) + (match_operand:SI 3 "register_operand" "0,0")) + (and:SI + (rotate:SI (ashift:SI (const_int 1) + (ashiftrt:HI + (match_dup:HI 2) + (const_int 5))) + (and:HI (match_dup 2) + (const_int 31))) + (match_operand:SI 1 "register_operand" "r,r"))))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "@ + cv.insert\t%0,%1,%Z2,%Y2 + cv.insertr\t%0,%1,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_bclr" + [(set (match_operand:SI 0 "register_operand" "=r,r") + (and:SI (rotate:SI (ashift:SI (const_int -2) + (ashiftrt:HI + (match_operand:HI 2 "bit_extract_operand" "CV_bit_si10,r") + (const_int 5))) + (and:HI (match_dup 2) + (const_int 31))) + (match_operand:SI 1 "register_operand" "r,r")))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "@ + cv.bclr\t%0,%1,%Z2,%Y2 + cv.bclrr\t%0,%1,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_bset" + [(set (match_operand:SI 0 "register_operand" "=r,r") + (ior:SI (rotate:SI (ashift:SI (const_int 1) + (ashiftrt:HI + (match_operand:HI 2 "bit_extract_operand" "CV_bit_si10,r") + (const_int 5))) + (and:HI (match_dup 2) + (const_int 31))) + (match_operand:SI 1 "register_operand" "r,r")))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "@ + cv.bset\t%0,%1,%Z2,%Y2 + cv.bsetr\t%0,%1,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_ff1" + [(set (match_operand:QI 0 "register_operand" "=r") + (if_then_else (eq:SI (match_operand:SI 1 "register_operand" "r") (const_int 0)) + (const_int 32) + (minus:SI (ffs:SI (match_dup 1)) + (const_int 1))))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "cv.ff1\t%0,%1" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_fl1" + [(set (match_operand:QI 0 "register_operand" "=r") + (unspec:QI [(match_operand:SI 1 "register_operand" "r")] + UNSPEC_CV_BITMANIP_FL1))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "cv.fl1\t%0,%1" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_clb" + [(set (match_operand:QI 0 "register_operand" "=r") + (if_then_else (eq:SI (match_operand:SI 1 "register_operand" "r") (const_int 0)) + (const_int 0) + (truncate:QI (clrsb:SI (match_dup 1)))))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "cv.clb\t%0,%1" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_cnt" + [(set (match_operand:QI 0 "register_operand" "=r") + (truncate:QI (popcount:SI (match_operand:SI 1 "register_operand" "r"))))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "cv.cnt\t%0,%1" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_ror" + [(set (match_operand:SI 0 "register_operand" "=r") + (rotatert:SI (match_operand:SI 1 "register_operand" "r") + (match_operand:SI 2 "register_operand" "r")))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "cv.ror\t%0,%1,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) + +(define_insn "riscv_cv_bitmanip_bitrev" + [(set (match_operand:SI 0 "register_operand" "=r") + (unspec:SI [(match_operand:SI 1 "register_operand" "r") + (match_operand:QI 2 "const_csr_operand" "K") + (match_operand:QI 3 "const_int2_operand" "D03")] + UNSPEC_CV_BITMANIP_BITREV))] + + "TARGET_XCVBITMANIP && !TARGET_64BIT" + "cv.bitrev\t%0,%1,%3,%2" + [(set_attr "type" "bitmanip") + (set_attr "mode" "SI")]) diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates.md index b1a79cae50a..57ac9cb92ae 100644 --- a/gcc/config/riscv/predicates.md +++ b/gcc/config/riscv/predicates.md @@ -425,6 +425,22 @@ (ior (match_operand 0 "register_operand") (match_code "const_int"))) +(define_predicate "const_int10_operand" + (and (match_code "const_int") + (match_test "IN_RANGE (INTVAL (op), 0, 1023)"))) + +(define_predicate "register_UHI_operand" + (and (match_code "reg,subreg") + (match_test "GET_MODE (op) == HImode"))) + +(define_predicate "bit_extract_operand" + (ior (match_operand 0 "const_int10_operand") + (match_operand 0 "register_UHI_operand"))) + +(define_predicate "const_int2_operand" + (and (match_code "const_int") + (match_test "IN_RANGE (INTVAL (op), 0, 3)"))) + ;; Predicates for the V extension. (define_special_predicate "vector_length_operand" (ior (match_operand 0 "pmode_register_operand") diff --git a/gcc/config/riscv/riscv-builtins.cc b/gcc/config/riscv/riscv-builtins.cc index 1932ff069c6..0c3a87f9926 100644 --- a/gcc/config/riscv/riscv-builtins.cc +++ b/gcc/config/riscv/riscv-builtins.cc @@ -135,6 +135,7 @@ AVAIL (hint_pause, (!0)) AVAIL (cvmac, TARGET_XCVMAC && !TARGET_64BIT) AVAIL (cvalu, TARGET_XCVALU && !TARGET_64BIT) AVAIL (cvelw, TARGET_XCVELW && !TARGET_64BIT) +AVAIL (cvbitmanip, TARGET_XCVBITMANIP && !TARGET_64BIT) /* Construct a riscv_builtin_description from the given arguments. diff --git a/gcc/config/riscv/riscv-ftypes.def b/gcc/config/riscv/riscv-ftypes.def index 5f051df2277..5c0ec6c3ed1 100644 --- a/gcc/config/riscv/riscv-ftypes.def +++ b/gcc/config/riscv/riscv-ftypes.def @@ -35,10 +35,13 @@ DEF_RISCV_FTYPE (1, (USI, USI)) DEF_RISCV_FTYPE (1, (UDI, UDI)) DEF_RISCV_FTYPE (1, (USI, UQI)) DEF_RISCV_FTYPE (1, (USI, UHI)) +DEF_RISCV_FTYPE (1, (UQI, USI)) DEF_RISCV_FTYPE (1, (SI, QI)) DEF_RISCV_FTYPE (1, (SI, HI)) DEF_RISCV_FTYPE (2, (USI, UQI, UQI)) DEF_RISCV_FTYPE (2, (USI, UHI, UHI)) +DEF_RISCV_FTYPE (2, (SI, USI, UHI)) +DEF_RISCV_FTYPE (2, (USI, USI, UHI)) DEF_RISCV_FTYPE (2, (USI, USI, USI)) DEF_RISCV_FTYPE (2, (USI, USI, UQI)) DEF_RISCV_FTYPE (2, (UDI, UQI, UQI)) @@ -52,6 +55,8 @@ DEF_RISCV_FTYPE (2, (SI, SI, SI)) DEF_RISCV_FTYPE (3, (USI, USI, USI, UQI)) DEF_RISCV_FTYPE (3, (USI, USI, USI, USI)) DEF_RISCV_FTYPE (3, (SI, SI, SI, UQI)) +DEF_RISCV_FTYPE (3, (USI, USI, UHI, USI)) +DEF_RISCV_FTYPE (3, (USI, USI, UQI, UQI)) DEF_RISCV_FTYPE (3, (SI, SI, SI, SI)) DEF_RISCV_FTYPE (4, (USI, USI, USI, USI, UQI)) DEF_RISCV_FTYPE (4, (SI, SI, SI, SI, UQI)) diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 41626fa34e4..27a183b858e 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -5842,6 +5842,19 @@ riscv_print_operand (FILE *file, rtx op, int letter) output_addr_const (file, newop); break; } + case 'Y': + { + rtx newop = GEN_INT (INTVAL (op) & 31); + output_addr_const (file, newop); + break; + } + case 'Z': + { + int ival = INTVAL (op) >> 5; + rtx newop = GEN_INT (ival & 31); + output_addr_const (file, newop); + break; + } default: switch (code) { diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt index 44ed6d69da2..0860cfb521c 100644 --- a/gcc/config/riscv/riscv.opt +++ b/gcc/config/riscv/riscv.opt @@ -425,6 +425,8 @@ Mask(XCVALU) Var(riscv_xcv_subext) Mask(XCVELW) Var(riscv_xcv_subext) +Mask(XCVBITMANIP) Var(riscv_xcv_subext) + TargetVariable int riscv_xthead_subext diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index b9129d1b464..8a2ba805b40 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -24407,6 +24407,59 @@ architecture. For more information on CORE-V ELW builtins, please see Generated assembler @code{cv.elw} @end deftypefn +These built-in functions are available for the CORE-V bit manipulation machine +architecture. For more information on CORE-V built-ins, please see +@uref{https://github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-builtin-spec.md#pulp-bit-manipulation-builtins-for-32-bit-cores} + +@deftypefn {Built-in Function} {int32_t} __builtin_riscv_cv_bitmanip_extract (uint32_t, uint16_t) +Generated assembler @code{cv.extract} if the uint16_t operand is a constant. Generated assembler +@code{cv.extractr} if the uint16_t operand is a register. +@end deftypefn + +@deftypefn {Built-in Function} {uint32_t} __builtin_riscv_cv_bitmanip_extractu (uint32_t, uint16_t) +Generated assembler @code{cv.extractu} if the uint16_t operand is a constant. Generated assembler +@code{cv.extractur} if the uint16_t operand is a register. +@end deftypefn + +@deftypefn {Built-in Function} {uint32_t} __builtin_riscv_cv_bitmanip_insert (uint32_t, uint16_t, uint32_t) +Generated assembler @code{cv.insert} if the uint16_t operand is a constant. Generated assembler +@code{cv.insertr} if the uint16_t operand is a register. +@end deftypefn + +@deftypefn {Built-in Function} {uint32_t} __builtin_riscv_cv_bitmanip_bclr (uint32_t, uint16_t) +Generated assembler @code{cv.bclr} if the uint16_t operand is a constant. Generated assembler +@code{cv.bclrr} if the uint16_t operand is a register. +@end deftypefn + +@deftypefn {Built-in Function} {uint32_t} __builtin_riscv_cv_bitmanip_bset (uint32_t, uint16_t) +Generated assembler @code{cv.bset} if the uint16_t operand is a constant. Generated assembler +@code{cv.bsetr} if the uint16_t operand is a register. +@end deftypefn + +@deftypefn {Built-in Function} {uint8_t} __builtin_riscv_cv_bitmanip_ff1 (uint32_t) +Generated assembler @code{cv.ff1} +@end deftypefn + +@deftypefn {Built-in Function} {uint8_t} __builtin_riscv_cv_bitmanip_fl1 (uint32_t) +Generated assembler @code{cv.fl1} +@end deftypefn + +@deftypefn {Built-in Function} {uint8_t} __builtin_riscv_cv_bitmanip_clb (uint32_t) +Generated assembler @code{cv.clb} +@end deftypefn + +@deftypefn {Built-in Function} {uint8_t} __builtin_riscv_cv_bitmanip_cnt (uint32_t) +Generated assembler @code{cv.cnt} +@end deftypefn + +@deftypefn {Built-in Function} {uint32_t} __builtin_riscv_cv_bitmanip_ror (uint32_t, uint32_t) +Generated assembler @code{cv.ror} +@end deftypefn + +@deftypefn {Built-in Function} {uint32_t} __builtin_riscv_cv_bitmanip_bitrev (uint32_t, uint8_t, uint8_t) +Generated assembler @code{cv.bitrev} +@end deftypefn + @node RX Built-in Functions @subsection RX Built-in Functions GCC supports some of the RX instructions which cannot be expressed in diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index 8082100a3c9..3795489c9ad 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2505,6 +2505,9 @@ Test system has support for the CORE-V ALU extension. @item cv_elw Test system has support for the CORE-V ELW extension. +@item cv_bitmanip +Test system has support for the CORE-V BITMANIP extension. + @end table @subsubsection Other hardware attributes diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclr.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclr.c new file mode 100644 index 00000000000..0cb2c6c5b81 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclr.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; +extern uint32_t res2; +extern uint32_t res3; +extern uint32_t res4; + +uint32_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_bclr (a, 200); + res2 = __builtin_riscv_cv_bitmanip_bclr (a, 0); + res3 = __builtin_riscv_cv_bitmanip_bclr (a, 31); + res4 = __builtin_riscv_cv_bitmanip_bclr (a, 1023); + + return res1 + res2 + res3 + res4; +} + +/* { dg-final { scan-assembler-times "cv\.bclr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),6,8" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bclr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,0" 1 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.bclr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,31" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bclr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),31,31" 1 { target { any-opts "-O0" } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclrr.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclrr.c new file mode 100644 index 00000000000..211a76a470e --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bclrr.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; + +uint32_t +foo (uint32_t a, uint16_t b) +{ + res1 = __builtin_riscv_cv_bitmanip_bclr (a, b); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.bclrr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bitrev.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bitrev.c new file mode 100644 index 00000000000..89af9eacbb2 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bitrev.c @@ -0,0 +1,30 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; +extern uint32_t res2; +extern uint32_t res3; +extern uint32_t res4; +extern uint32_t res5; + +uint32_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_bitrev (a, 20, 2); + res2 = __builtin_riscv_cv_bitmanip_bitrev (a, 0, 0); + res3 = __builtin_riscv_cv_bitmanip_bitrev (a, 31, 0); + res4 = __builtin_riscv_cv_bitmanip_bitrev (a, 0, 3); + res5 = __builtin_riscv_cv_bitmanip_bitrev (a, 31, 3); + + return res1 + res2 + res3 + res4 + res5; +} + +/* { dg-final { scan-assembler-times "cv\.bitrev\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),2,20" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bitrev\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,0" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bitrev\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,31" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bitrev\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),3,0" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bitrev\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),3,31" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bset.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bset.c new file mode 100644 index 00000000000..72970123700 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bset.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; +extern uint32_t res2; +extern uint32_t res3; +extern uint32_t res4; + +uint32_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_bset (a, 200); + res2 = __builtin_riscv_cv_bitmanip_bset (a, 0); + res3 = __builtin_riscv_cv_bitmanip_bset (a, 31); + res4 = __builtin_riscv_cv_bitmanip_bset (a, 1023); + + return res1 + res2 + res3 + res4; +} + +/* { dg-final { scan-assembler-times "cv\.bset\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),6,8" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bset\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,0" 1 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.bset\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,31" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.bset\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),31,31" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bsetr.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bsetr.c new file mode 100644 index 00000000000..6e3790a9e91 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-bsetr.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; + +uint32_t +foo (uint32_t a, uint16_t b) +{ + res1 = __builtin_riscv_cv_bitmanip_bset (a, b); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.bsetr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-clb.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-clb.c new file mode 100644 index 00000000000..34a2784a6af --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-clb.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint8_t res1; + +uint8_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_clb (a); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.clb\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-cnt.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-cnt.c new file mode 100644 index 00000000000..dd9398c45c1 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-cnt.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint8_t res1; + +uint8_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_cnt (a); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.cnt\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extract.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extract.c new file mode 100644 index 00000000000..09ddbbb76ee --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extract.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern int32_t res1; +extern int32_t res2; +extern int32_t res3; +extern int32_t res4; + +int32_t +foo (int32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_extract (a, 200); + res2 = __builtin_riscv_cv_bitmanip_extract (a, 0); + res3 = __builtin_riscv_cv_bitmanip_extract (a, 31); + res4 = __builtin_riscv_cv_bitmanip_extract (a, 1023); + + return res1 + res2 + res3 + res4; +} + +/* { dg-final { scan-assembler-times "cv\.extract\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),6,8" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.extract\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,0" 1 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.extract\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,31" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.extract\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),31,31" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractr.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractr.c new file mode 100644 index 00000000000..3b935c53ac5 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractr.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern int32_t res1; + +int32_t +foo (int32_t a, uint16_t b) +{ + res1 = __builtin_riscv_cv_bitmanip_extract (a, b); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.extractr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractu.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractu.c new file mode 100644 index 00000000000..cbe494c0968 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractu.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; +extern uint32_t res2; +extern uint32_t res3; +extern uint32_t res4; + +uint32_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_extractu (a, 200); + res2 = __builtin_riscv_cv_bitmanip_extractu (a, 0); + res3 = __builtin_riscv_cv_bitmanip_extractu (a, 31); + res4 = __builtin_riscv_cv_bitmanip_extractu (a, 1023); + + return res1 + res2 + res3 + res4; +} + +/* { dg-final { scan-assembler-times "cv\.extractu\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),6,8" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.extractu\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,0" 1 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.extractu\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,31" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.extractu\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),31,31" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractur.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractur.c new file mode 100644 index 00000000000..742803ecc19 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-extractur.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; + +uint32_t +foo (uint32_t a, uint16_t b) +{ + res1 = __builtin_riscv_cv_bitmanip_extractu (a, b); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.extractur\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ff1.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ff1.c new file mode 100644 index 00000000000..eab4e4df7f7 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ff1.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint8_t res1; + +uint8_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_ff1 (a); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.ff1\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-fl1.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-fl1.c new file mode 100644 index 00000000000..2ea8686d2e2 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-fl1.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint8_t res1; + +uint8_t +foo (uint32_t a) +{ + res1 = __builtin_riscv_cv_bitmanip_fl1 (a); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.fl1\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insert.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insert.c new file mode 100644 index 00000000000..de58df9e3f2 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insert.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; +extern uint32_t res2; +extern uint32_t res3; + +uint32_t +foo (uint32_t a, uint32_t b) +{ + res1 = __builtin_riscv_cv_bitmanip_insert (a, 200, b); + res2 = __builtin_riscv_cv_bitmanip_insert (a, 0, b); + res3 = __builtin_riscv_cv_bitmanip_insert (a, 31, b); + + return res1 + res2 + res3; +} + +/* { dg-final { scan-assembler-times "cv\.insert\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),6,8" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.insert\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,0" 1 } } */ +/* { dg-final { scan-assembler-times "cv\.insert\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),0,31" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insertr.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insertr.c new file mode 100644 index 00000000000..9b67c64ccd0 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-insertr.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; + +uint32_t +foo (uint32_t a, uint16_t b, uint32_t c) +{ + res1 = __builtin_riscv_cv_bitmanip_insert (a, b, c); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.insertr\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ror.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ror.c new file mode 100644 index 00000000000..67de86306bf --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-compile-ror.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ + +#include +#include + +extern uint32_t res1; + +uint32_t +foo (uint32_t a, uint32_t b) +{ + res1 = __builtin_riscv_cv_bitmanip_ror (a, b); + + return res1; +} + +/* { dg-final { scan-assembler-times "cv\.ror\t\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\),\(\?\:t\[0-6\]\|a\[0-7\]\|s\[1-11\]\)" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bclr.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bclr.c new file mode 100644 index 00000000000..12aca4ed945 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bclr.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ +/* { dg-skip-if "Skip LTO tests of builtin compilation" { *-*-* } { "-flto" } } */ + +#include +#include + +extern uint32_t res1, res2, res3, res4, res5, res6; + +uint32_t +foo (void) +{ + res1 = __builtin_riscv_cv_bitmanip_bclr (648, -1); + res2 = __builtin_riscv_cv_bitmanip_bclr (648, 1); + res3 = __builtin_riscv_cv_bitmanip_bclr (648, 4); + res4 = __builtin_riscv_cv_bitmanip_bclr (684, 1023); + res5 = __builtin_riscv_cv_bitmanip_bclr (648, 1024); + res6 = __builtin_riscv_cv_bitmanip_bclr (648, 65536); /* { dg-warning "unsigned conversion from \'int\' to \'short unsigned int\' changes value from \'65536\' to \'0\'" "" { target *-*-* } } */ + + return res1 + res2 + res3 + res4 + res5 + res6; +} + +/* { dg-final { scan-assembler-times "cv\.bclr\t" 4 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.bclrr\t" 2 { target { any-opts "-O0" } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bitrev.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bitrev.c new file mode 100644 index 00000000000..33650dd2e2d --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bitrev.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ +/* { dg-skip-if "Skip LTO tests of builtin compilation" { *-*-* } { "-flto" } } */ + +#include +#include + +extern uint32_t res1; +extern uint32_t res2; +extern uint32_t res3; +extern uint32_t res4; + +uint32_t +foo (void) +{ + res1 = __builtin_riscv_cv_bitmanip_bitrev (648, 0, -1); /* { dg-error "invalid argument to built-in function" "" { target *-*-* } } */ + res2 = __builtin_riscv_cv_bitmanip_bitrev (648, -1, 0); /* { dg-error "invalid argument to built-in function" "" { target *-*-* } } */ + res3 = __builtin_riscv_cv_bitmanip_bitrev (648, 21, 4); /* { dg-error "invalid argument to built-in function" "" { target *-*-* } } */ + res4 = __builtin_riscv_cv_bitmanip_bitrev (648, 32, 2); /* { dg-error "invalid argument to built-in function" "" { target *-*-* } } */ + + return res1+res2+res3+res4; +} diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bset.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bset.c new file mode 100644 index 00000000000..6b40efef2c2 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-bset.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ +/* { dg-skip-if "Skip LTO tests of builtin compilation" { *-*-* } { "-flto" } } */ + +#include +#include + +extern uint32_t res1, res2, res3, res4, res5, res6; + +uint32_t +foo (void) +{ + res1 = __builtin_riscv_cv_bitmanip_bset (648, -1); + res2 = __builtin_riscv_cv_bitmanip_bset (648, 1); + res3 = __builtin_riscv_cv_bitmanip_bset (648, 4); + res4 = __builtin_riscv_cv_bitmanip_bset (648, 1023); + res5 = __builtin_riscv_cv_bitmanip_bset (648, 1024); + res6 = __builtin_riscv_cv_bitmanip_bset (648, 65536); /* { dg-warning "unsigned conversion from \'int\' to \'short unsigned int\' changes value from \'65536\' to \'0\'" "" { target *-*-* } } */ + + return res1 + res2 + res3 + res4 + res5 + res6; +} + +/* { dg-final { scan-assembler-times "cv\.bset\t" 4 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.bsetr\t" 2 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extract.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extract.c new file mode 100644 index 00000000000..1dcef511670 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extract.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ +/* { dg-skip-if "Skip LTO tests of builtin compilation" { *-*-* } { "-flto" } } */ + +#include +#include + +extern uint32_t res1, res2, res3, res4, res5, res6; + +uint32_t +foo (void) +{ + res1 = __builtin_riscv_cv_bitmanip_extract (648, -1); + res2 = __builtin_riscv_cv_bitmanip_extract (648, 1); + res3 = __builtin_riscv_cv_bitmanip_extract (648, 230); + res4 = __builtin_riscv_cv_bitmanip_extract (648, 1023); + res5 = __builtin_riscv_cv_bitmanip_extract (648, 1024); + res6 = __builtin_riscv_cv_bitmanip_extract (648, 65536); /* { dg-warning "unsigned conversion from \'int\' to \'short unsigned int\' changes value from \'65536\' to \'0\'" "" { target *-*-* } } */ + + return res1 + res2 + res3 + res4 + res5 + res6; +} + +/* { dg-final { scan-assembler-times "cv\.extract\t" 4 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.extractr\t" 2 { target { any-opts "-O0" } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extractu.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extractu.c new file mode 100644 index 00000000000..fbb44cbd3ee --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-extractu.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ +/* { dg-skip-if "Skip LTO tests of builtin compilation" { *-*-* } { "-flto" } } */ + +#include +#include + +extern uint32_t res1, res2, res3, res4, res5, res6; + +uint32_t +foo (void) +{ + res1 = __builtin_riscv_cv_bitmanip_extractu (648, -1); + res2 = __builtin_riscv_cv_bitmanip_extractu (648, 1); + res3 = __builtin_riscv_cv_bitmanip_extractu (648, 230); + res4 = __builtin_riscv_cv_bitmanip_extractu (648, 1023); + res5 = __builtin_riscv_cv_bitmanip_extractu (648, 1024); + res6 = __builtin_riscv_cv_bitmanip_extractu (648, 65536); /* { dg-warning "unsigned conversion from \'int\' to \'short unsigned int\' changes value from \'65536\' to \'0\'" "" { target *-*-* } } */ + + return res1 + res2 + res3 + res4 + res5 + res6; +} + +/* { dg-final { scan-assembler-times "cv\.extractu\t" 4 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.extractur\t" 2 { target { any-opts "-O0" } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-insert.c b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-insert.c new file mode 100644 index 00000000000..47ebec613fb --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/cv-bitmanip-fail-compile-insert.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target cv_bitmanip } */ +/* { dg-options "-march=rv32i_xcvbitmanip -mabi=ilp32" } */ +/* { dg-skip-if "Skip LTO tests of builtin compilation" { *-*-* } { "-flto" } } */ + +#include +#include + +extern uint32_t res1, res2, res3, res4, res5, res6; + +uint32_t +foo (void) +{ + res1 = __builtin_riscv_cv_bitmanip_insert (648, -1, 645); + res2 = __builtin_riscv_cv_bitmanip_insert (648, 1, 645); + res3 = __builtin_riscv_cv_bitmanip_insert (648, 200, 645); + res4 = __builtin_riscv_cv_bitmanip_insert (1648, 1023, 1645); + res5 = __builtin_riscv_cv_bitmanip_insert (1648, 1024, 1645); + res6 = __builtin_riscv_cv_bitmanip_insert (1648, 65536, 1645); /* { dg-warning "unsigned conversion from \'int\' to \'short unsigned int\' changes value from \'65536\' to \'0\'" } */ + + return res1 + res2 + res3 + res4 + res5 + res6; +} + +/* { dg-final { scan-assembler-times "cv\.insert\t" 4 { target { any-opts "-O0" } } } } */ +/* { dg-final { scan-assembler-times "cv\.insertr\t" 2 { target { any-opts "-O0" } } } } */ diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index fac32fb3d0e..c15d10f1363 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -13345,6 +13345,19 @@ proc check_effective_target_cv_elw { } { } "-march=rv32i_xcvelw" ] } +# Return 1 if the CORE-V BITMANIP extension is available. +proc check_effective_target_cv_bitmanip { } { + if { !([istarget riscv*-*-*]) } { + return 0 + } + return [check_no_compiler_messages cv_bitmanip object { + void foo (void) + { + asm ("cv.extract t0, t1, 20, 20"); + } + } "-march=rv32i_xcvbitmanip" ] +} + proc check_effective_target_loongarch_sx { } { return [check_no_compiler_messages loongarch_lsx assembly { #if !defined(__loongarch_sx)