From: Craig Topper Date: Thu, 22 Jun 2023 16:22:58 +0000 (-0700) Subject: [RISCV] Move Zca/Zcb/Zcd/Zcf/Zcmp/Zcmt out of experimental status. X-Git-Tag: upstream/17.0.6~4198 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08f1aa87281f969bb5a46a780385819079067826;p=platform%2Fupstream%2Fllvm.git [RISCV] Move Zca/Zcb/Zcd/Zcf/Zcmp/Zcmt out of experimental status. According to https://wiki.riscv.org/display/HOME/Recently+Ratified+Extensions these were ratified in April 2023. Reviewed By: VincentWu Differential Revision: https://reviews.llvm.org/D153161 --- diff --git a/clang/test/Driver/riscv-arch.c b/clang/test/Driver/riscv-arch.c index 848fc14..8929d88 100644 --- a/clang/test/Driver/riscv-arch.c +++ b/clang/test/Driver/riscv-arch.c @@ -373,24 +373,24 @@ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZFHMIN %s // RV32-ZFHMIN: "-target-feature" "+zfhmin" -// RUN: %clang --target=riscv32-unknown-elf -march=rv32izca -### %s \ +// RUN: %clang --target=riscv32-unknown-elf -march=rv32izfa -### %s \ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-NOFLAG %s -// RV32-EXPERIMENTAL-NOFLAG: error: invalid arch name 'rv32izca' +// RV32-EXPERIMENTAL-NOFLAG: error: invalid arch name 'rv32izfa' // RV32-EXPERIMENTAL-NOFLAG: requires '-menable-experimental-extensions' -// RUN: %clang --target=riscv32-unknown-elf -march=rv32izca -menable-experimental-extensions -### %s \ +// RUN: %clang --target=riscv32-unknown-elf -march=rv32izfa -menable-experimental-extensions -### %s \ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-NOVERS %s -// RV32-EXPERIMENTAL-NOVERS: error: invalid arch name 'rv32izca' +// RV32-EXPERIMENTAL-NOVERS: error: invalid arch name 'rv32izfa' // RV32-EXPERIMENTAL-NOVERS: experimental extension requires explicit version number -// RUN: %clang --target=riscv32-unknown-elf -march=rv32izca0p1 -menable-experimental-extensions -### %s \ +// RUN: %clang --target=riscv32-unknown-elf -march=rv32izfa0p1 -menable-experimental-extensions -### %s \ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-BADVERS %s -// RV32-EXPERIMENTAL-BADVERS: error: invalid arch name 'rv32izca0p1' -// RV32-EXPERIMENTAL-BADVERS: unsupported version number 0.1 for experimental extension 'zca' (this compiler supports 1.0) +// RV32-EXPERIMENTAL-BADVERS: error: invalid arch name 'rv32izfa0p1' +// RV32-EXPERIMENTAL-BADVERS: unsupported version number 0.1 for experimental extension 'zfa' (this compiler supports 0.2) -// RUN: %clang --target=riscv32-unknown-elf -march=rv32izca1p0 -menable-experimental-extensions -### %s \ +// RUN: %clang --target=riscv32-unknown-elf -march=rv32izfa0p2 -menable-experimental-extensions -### %s \ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-GOODVERS %s -// RV32-EXPERIMENTAL-GOODVERS: "-target-feature" "+experimental-zca" +// RV32-EXPERIMENTAL-GOODVERS: "-target-feature" "+experimental-zfa" // RUN: %clang --target=riscv32-unknown-elf -march=rv32izbb1p0 -### %s \ // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZBB %s diff --git a/llvm/docs/RISCVUsage.rst b/llvm/docs/RISCVUsage.rst index 5bf622c..4fcc5bc 100644 --- a/llvm/docs/RISCVUsage.rst +++ b/llvm/docs/RISCVUsage.rst @@ -100,6 +100,12 @@ on support follow. ``Zbkc`` Supported ``Zbkx`` Supported (`See note <#riscv-scalar-crypto-note1>`__) ``Zbs`` Supported + ``Zca`` Supported + ``Zcb`` Supported + ``Zcd`` Supported + ``Zcf`` Supported + ``Zcmp`` Assembly Support + ``Zcmt`` Assembly Support ``Zdinx`` Supported ``Zfh`` Supported ``Zfhmin`` Supported @@ -183,24 +189,6 @@ The primary goal of experimental support is to assist in the process of ratifica ``experimental-ssaia`` LLVM implements the `Ratification candidate 3 `_. -``experimental-zca`` - LLVM implements the `1.0.1 draft specification `__. - -``experimental-zcb`` - LLVM implements the `1.0.1 draft specification `__. - -``experimental-zcd`` - LLVM implements the `1.0.1 draft specification `__. - -``experimental-zcf`` - LLVM implements the `1.0.1 draft specification `__. - -``experimental-zcmp`` - LLVM implements the `1.0.1 draft specification `__. - -``experimental-zcmt`` - LLVM implements the `1.0.1 draft specification `_. - ``experimental-zfa`` LLVM implements the `0.2 draft specification `__. diff --git a/llvm/lib/Support/RISCVISAInfo.cpp b/llvm/lib/Support/RISCVISAInfo.cpp index 9e3fd19..6ceb41a 100644 --- a/llvm/lib/Support/RISCVISAInfo.cpp +++ b/llvm/lib/Support/RISCVISAInfo.cpp @@ -56,6 +56,13 @@ static const RISCVSupportedExtension SupportedExtensions[] = { {"zihintpause", RISCVExtensionVersion{2, 0}}, + {"zca", RISCVExtensionVersion{1, 0}}, + {"zcb", RISCVExtensionVersion{1, 0}}, + {"zcd", RISCVExtensionVersion{1, 0}}, + {"zcf", RISCVExtensionVersion{1, 0}}, + {"zcmp", RISCVExtensionVersion{1, 0}}, + {"zcmt", RISCVExtensionVersion{1, 0}}, + {"zfhmin", RISCVExtensionVersion{1, 0}}, {"zfh", RISCVExtensionVersion{1, 0}}, @@ -140,12 +147,6 @@ static const RISCVSupportedExtension SupportedExperimentalExtensions[] = { {"zihintntl", RISCVExtensionVersion{0, 2}}, - {"zca", RISCVExtensionVersion{1, 0}}, - {"zcb", RISCVExtensionVersion{1, 0}}, - {"zcd", RISCVExtensionVersion{1, 0}}, - {"zcf", RISCVExtensionVersion{1, 0}}, - {"zcmp", RISCVExtensionVersion{1, 0}}, - {"zcmt", RISCVExtensionVersion{1, 0}}, {"zfa", RISCVExtensionVersion{0, 2}}, {"zfbfmin", RISCVExtensionVersion{0, 6}}, {"zicond", RISCVExtensionVersion{1, 0}}, diff --git a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp index c4e4279..8f66f54 100644 --- a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp +++ b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp @@ -2803,7 +2803,7 @@ bool RISCVAsmParser::parseDirectiveOption() { getTargetStreamer().emitDirectiveOptionNoRVC(); clearFeatureBits(RISCV::FeatureStdExtC, "c"); - clearFeatureBits(RISCV::FeatureStdExtZca, "+experimental-zca"); + clearFeatureBits(RISCV::FeatureStdExtZca, "+zca"); return false; } diff --git a/llvm/lib/Target/RISCV/RISCVFeatures.td b/llvm/lib/Target/RISCV/RISCVFeatures.td index 8541587..c16e349 100644 --- a/llvm/lib/Target/RISCV/RISCVFeatures.td +++ b/llvm/lib/Target/RISCV/RISCVFeatures.td @@ -323,7 +323,7 @@ def FeatureStdExtZk FeatureStdExtZkt]>; def FeatureStdExtZca - : SubtargetFeature<"experimental-zca", "HasStdExtZca", "true", + : SubtargetFeature<"zca", "HasStdExtZca", "true", "'Zca' (part of the C extension, excluding compressed " "floating point loads/stores)">; @@ -335,7 +335,7 @@ def HasStdExtCOrZca "compressed floating point loads/stores)">; def FeatureStdExtZcb - : SubtargetFeature<"experimental-zcb", "HasStdExtZcb", "true", + : SubtargetFeature<"zcb", "HasStdExtZcb", "true", "'Zcb' (Compressed basic bit manipulation instructions)", [FeatureStdExtZca]>; def HasStdExtZcb : Predicate<"Subtarget->hasStdExtZcb()">, @@ -343,7 +343,7 @@ def HasStdExtZcb : Predicate<"Subtarget->hasStdExtZcb()">, "'Zcb' (Compressed basic bit manipulation instructions)">; def FeatureStdExtZcd - : SubtargetFeature<"experimental-zcd", "HasStdExtZcd", "true", + : SubtargetFeature<"zcd", "HasStdExtZcd", "true", "'Zcd' (Compressed Double-Precision Floating-Point Instructions)">; def HasStdExtCOrZcd @@ -353,7 +353,7 @@ def HasStdExtCOrZcd "'Zcd' (Compressed Double-Precision Floating-Point Instructions)">; def FeatureStdExtZcf - : SubtargetFeature<"experimental-zcf", "HasStdExtZcf", "true", + : SubtargetFeature<"zcf", "HasStdExtZcf", "true", "'Zcf' (Compressed Single-Precision Floating-Point Instructions)">; def HasStdExtCOrZcf @@ -363,7 +363,7 @@ def HasStdExtCOrZcf "'Zcf' (Compressed Single-Precision Floating-Point Instructions)">; def FeatureStdExtZcmp - : SubtargetFeature<"experimental-zcmp", "HasStdExtZcmp", "true", + : SubtargetFeature<"zcmp", "HasStdExtZcmp", "true", "'Zcmp' (sequenced instuctions for code-size reduction)", [FeatureStdExtZca]>; def HasStdExtZcmp : Predicate<"Subtarget->hasStdExtZcmp() && !Subtarget->hasStdExtC()">, @@ -371,7 +371,7 @@ def HasStdExtZcmp : Predicate<"Subtarget->hasStdExtZcmp() && !Subtarget->hasStdE "'Zcmp' (sequenced instuctions for code-size reduction)">; def FeatureStdExtZcmt - : SubtargetFeature<"experimental-zcmt", "HasStdExtZcmt", "true", + : SubtargetFeature<"zcmt", "HasStdExtZcmt", "true", "'Zcmt' (table jump instuctions for code-size reduction)", [FeatureStdExtZca, FeatureStdExtZicsr]>; def HasStdExtZcmt : Predicate<"Subtarget->hasStdExtZcmt()">, diff --git a/llvm/test/CodeGen/RISCV/add-before-shl.ll b/llvm/test/CodeGen/RISCV/add-before-shl.ll index ce6c802..a41664f 100644 --- a/llvm/test/CodeGen/RISCV/add-before-shl.ll +++ b/llvm/test/CodeGen/RISCV/add-before-shl.ll @@ -7,9 +7,9 @@ ; RUN: < %s | FileCheck -check-prefixes=RV32C %s ; RUN: llc -mtriple=riscv64 -mattr=+c -verify-machineinstrs --riscv-no-aliases \ ; RUN: < %s | FileCheck -check-prefixes=RV64C %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zca -verify-machineinstrs --riscv-no-aliases \ +; RUN: llc -mtriple=riscv32 -mattr=+zca -verify-machineinstrs --riscv-no-aliases \ ; RUN: < %s | FileCheck -check-prefixes=RV32C %s -; RUN: llc -mtriple=riscv64 -mattr=+experimental-zca -verify-machineinstrs --riscv-no-aliases \ +; RUN: llc -mtriple=riscv64 -mattr=+zca -verify-machineinstrs --riscv-no-aliases \ ; RUN: < %s | FileCheck -check-prefixes=RV64C %s ; These test that constant adds are not moved after shifts by DAGCombine, diff --git a/llvm/test/CodeGen/RISCV/attributes.ll b/llvm/test/CodeGen/RISCV/attributes.ll index 8283bf6..0c35be0 100644 --- a/llvm/test/CodeGen/RISCV/attributes.ll +++ b/llvm/test/CodeGen/RISCV/attributes.ll @@ -48,11 +48,12 @@ ; RUN: llc -mtriple=riscv32 -mattr=+xtheadmemidx %s -o - | FileCheck --check-prefix=RV32XTHEADMEMIDX %s ; RUN: llc -mtriple=riscv32 -mattr=+xtheadmempair %s -o - | FileCheck --check-prefix=RV32XTHEADMEMPAIR %s ; RUN: llc -mtriple=riscv32 -mattr=+xtheadsync %s -o - | FileCheck --check-prefix=RV32XTHEADSYNC %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zca %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCA %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zcb %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCB %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zcd %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCD %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zcf %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCF %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zcmt %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCMT %s +; RUN: llc -mtriple=riscv32 -mattr=+zca %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCA %s +; RUN: llc -mtriple=riscv32 -mattr=+zcb %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCB %s +; RUN: llc -mtriple=riscv32 -mattr=+zcd %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCD %s +; RUN: llc -mtriple=riscv32 -mattr=+zcf %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCF %s +; RUN: llc -mtriple=riscv32 -mattr=+zcmp %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCMP %s +; RUN: llc -mtriple=riscv32 -mattr=+zcmt %s -o - | FileCheck --check-prefixes=CHECK,RV32ZCMT %s ; RUN: llc -mtriple=riscv32 -mattr=+zicsr %s -o - | FileCheck --check-prefixes=CHECK,RV32ZICSR %s ; RUN: llc -mtriple=riscv32 -mattr=+zifencei %s -o - | FileCheck --check-prefixes=CHECK,RV32ZIFENCEI %s ; RUN: llc -mtriple=riscv32 -mattr=+zicntr %s -o - | FileCheck --check-prefixes=CHECK,RV32ZICNTR %s @@ -135,10 +136,11 @@ ; RUN: llc -mtriple=riscv64 -mattr=+xtheadvdot %s -o - | FileCheck --check-prefixes=CHECK,RV64XTHEADVDOT %s ; RUN: llc -mtriple=riscv64 -mattr=+zawrs %s -o - | FileCheck --check-prefixes=CHECK,RV64ZAWRS %s ; RUN: llc -mtriple=riscv64 -mattr=+experimental-ztso %s -o - | FileCheck --check-prefixes=CHECK,RV64ZTSO %s -; RUN: llc -mtriple=riscv64 -mattr=+experimental-zca %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCA %s -; RUN: llc -mtriple=riscv64 -mattr=+experimental-zcb %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCB %s -; RUN: llc -mtriple=riscv64 -mattr=+experimental-zcd %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCD %s -; RUN: llc -mtriple=riscv64 -mattr=+experimental-zcmt %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCMT %s +; RUN: llc -mtriple=riscv64 -mattr=+zca %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCA %s +; RUN: llc -mtriple=riscv64 -mattr=+zcb %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCB %s +; RUN: llc -mtriple=riscv64 -mattr=+zcd %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCD %s +; RUN: llc -mtriple=riscv64 -mattr=+zcmp %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCMP %s +; RUN: llc -mtriple=riscv64 -mattr=+zcmt %s -o - | FileCheck --check-prefixes=CHECK,RV64ZCMT %s ; RUN: llc -mtriple=riscv64 -mattr=+zicsr %s -o - | FileCheck --check-prefixes=CHECK,RV64ZICSR %s ; RUN: llc -mtriple=riscv64 -mattr=+zifencei %s -o - | FileCheck --check-prefixes=CHECK,RV64ZIFENCEI %s ; RUN: llc -mtriple=riscv64 -mattr=+zicntr %s -o - | FileCheck --check-prefixes=CHECK,RV64ZICNTR %s @@ -219,6 +221,7 @@ ; RV32ZCB: .attribute 5, "rv32i2p1_zca1p0_zcb1p0" ; RV32ZCD: .attribute 5, "rv32i2p1_zcd1p0" ; RV32ZCF: .attribute 5, "rv32i2p1_zcf1p0" +; RV32ZCMP: .attribute 5, "rv32i2p1_zca1p0_zcmp1p0" ; RV32ZCMT: .attribute 5, "rv32i2p1_zicsr2p0_zca1p0_zcmt1p0" ; RV32ZICSR: .attribute 5, "rv32i2p1_zicsr2p0" ; RV32ZIFENCEI: .attribute 5, "rv32i2p1_zifencei2p0" @@ -304,6 +307,7 @@ ; RV64ZCA: .attribute 5, "rv64i2p1_zca1p0" ; RV64ZCB: .attribute 5, "rv64i2p1_zca1p0_zcb1p0" ; RV64ZCD: .attribute 5, "rv64i2p1_zcd1p0" +; RV64ZCMP: .attribute 5, "rv64i2p1_zca1p0_zcmp1p0" ; RV64ZCMT: .attribute 5, "rv64i2p1_zicsr2p0_zca1p0_zcmt1p0" ; RV64ZICSR: .attribute 5, "rv64i2p1_zicsr2p0" ; RV64ZIFENCEI: .attribute 5, "rv64i2p1_zifencei2p0" diff --git a/llvm/test/CodeGen/RISCV/cm_mvas_mvsa.ll b/llvm/test/CodeGen/RISCV/cm_mvas_mvsa.ll index 8ac6d6d..ff9df96 100644 --- a/llvm/test/CodeGen/RISCV/cm_mvas_mvsa.ll +++ b/llvm/test/CodeGen/RISCV/cm_mvas_mvsa.ll @@ -1,11 +1,11 @@ ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2 ; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \ ; RUN: | FileCheck -check-prefixes=CHECK32I %s -; RUN: llc -mtriple=riscv32 -mattr=+experimental-zcmp -verify-machineinstrs < %s \ +; RUN: llc -mtriple=riscv32 -mattr=+zcmp -verify-machineinstrs < %s \ ; RUN: | FileCheck -check-prefixes=CHECK32ZCMP %s ; RUN: llc -mtriple=riscv64 -verify-machineinstrs < %s \ ; RUN: | FileCheck -check-prefixes=CHECK64I %s -; RUN: llc -mtriple=riscv64 -mattr=+experimental-zcmp -verify-machineinstrs < %s \ +; RUN: llc -mtriple=riscv64 -mattr=+zcmp -verify-machineinstrs < %s \ ; RUN: | FileCheck -check-prefixes=CHECK64ZCMP %s declare i32 @foo(i32) diff --git a/llvm/test/MC/RISCV/align.s b/llvm/test/MC/RISCV/align.s index 72cf375..2eb7186 100644 --- a/llvm/test/MC/RISCV/align.s +++ b/llvm/test/MC/RISCV/align.s @@ -22,10 +22,10 @@ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=C-OR-ZCA-EXT-RELAX-RELOC %s # Relaxation enabled with Zca extension: -# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zca,+relax < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -d -M no-aliases - \ +# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zca,+relax < %s \ +# RUN: | llvm-objdump --mattr=+zca -d -M no-aliases - \ # RUN: | FileCheck -check-prefix=C-OR-ZCA-EXT-RELAX-INST %s -# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zca,+relax < %s \ +# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zca,+relax < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=C-OR-ZCA-EXT-RELAX-RELOC %s # Relaxation disabled with C extension: @@ -36,10 +36,10 @@ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=C-OR-ZCA-EXT-NORELAX-RELOC %s # Relaxation disabled with ZCA extension: -# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zca,-relax < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -d -M no-aliases - \ +# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zca,-relax < %s \ +# RUN: | llvm-objdump --mattr=+zca -d -M no-aliases - \ # RUN: | FileCheck -check-prefix=C-OR-ZCA-EXT-NORELAX-INST %s -# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zca,-relax < %s \ +# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zca,-relax < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=C-OR-ZCA-EXT-NORELAX-RELOC %s # We need to insert N-MinNopSize bytes NOPs and R_RISCV_ALIGN relocation diff --git a/llvm/test/MC/RISCV/compress-rv32d.s b/llvm/test/MC/RISCV/compress-rv32d.s index 2b2fc13..908450a 100644 --- a/llvm/test/MC/RISCV/compress-rv32d.s +++ b/llvm/test/MC/RISCV/compress-rv32d.s @@ -8,15 +8,15 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c,+d -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+d -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcd,+d -show-encoding < %s \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcd,+d -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcd,+d -show-encoding \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcd,+d -show-encoding \ # RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcd,+d -filetype=obj < %s \ -# RUN: | llvm-objdump --triple=riscv32 --mattr=+experimental-zcd,+d -d - \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcd,+d -filetype=obj < %s \ +# RUN: | llvm-objdump --triple=riscv32 --mattr=+zcd,+d -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcd,+d -filetype=obj < %s \ -# RUN: | llvm-objdump --triple=riscv32 --mattr=+experimental-zcd,+d -d -M no-aliases - \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcd,+d -filetype=obj < %s \ +# RUN: | llvm-objdump --triple=riscv32 --mattr=+zcd,+d -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -show-encoding < %s \ @@ -29,15 +29,15 @@ # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c,+d -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s -# RUN: llvm-mc -triple riscv64 -mattr=+experimental-zcd,+d -show-encoding < %s \ +# RUN: llvm-mc -triple riscv64 -mattr=+zcd,+d -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv64 -mattr=+experimental-zcd,+d -show-encoding \ +# RUN: llvm-mc -triple riscv64 -mattr=+zcd,+d -show-encoding \ # RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s -# RUN: llvm-mc -triple riscv64 -mattr=+experimental-zcd,+d -filetype=obj < %s \ -# RUN: | llvm-objdump --triple=riscv64 --mattr=+experimental-zcd,+d -d - \ +# RUN: llvm-mc -triple riscv64 -mattr=+zcd,+d -filetype=obj < %s \ +# RUN: | llvm-objdump --triple=riscv64 --mattr=+zcd,+d -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv64 -mattr=+experimental-zcd,+d -filetype=obj < %s \ -# RUN: | llvm-objdump --triple=riscv64 --mattr=+experimental-zcd,+d -d -M no-aliases - \ +# RUN: llvm-mc -triple riscv64 -mattr=+zcd,+d -filetype=obj < %s \ +# RUN: | llvm-objdump --triple=riscv64 --mattr=+zcd,+d -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # Tests double precision floating point instructions available in rv32 and in rv64. diff --git a/llvm/test/MC/RISCV/compress-rv32f.s b/llvm/test/MC/RISCV/compress-rv32f.s index 476cc14..460bca6 100644 --- a/llvm/test/MC/RISCV/compress-rv32f.s +++ b/llvm/test/MC/RISCV/compress-rv32f.s @@ -8,15 +8,15 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c,+f -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+f -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcf,+f -show-encoding < %s \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcf,+f -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcf,+f -show-encoding \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcf,+f -show-encoding \ # RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcf,+f -filetype=obj < %s \ -# RUN: | llvm-objdump --triple=riscv32 --mattr=+experimental-zcf,+f -d - \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcf,+f -filetype=obj < %s \ +# RUN: | llvm-objdump --triple=riscv32 --mattr=+zcf,+f -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv32 -mattr=+experimental-zcf,+f -filetype=obj < %s \ -# RUN: | llvm-objdump --triple=riscv32 --mattr=+experimental-zcf,+f -d -M no-aliases - \ +# RUN: llvm-mc -triple riscv32 -mattr=+zcf,+f -filetype=obj < %s \ +# RUN: | llvm-objdump --triple=riscv32 --mattr=+zcf,+f -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # Instructions that are 32 bit only. diff --git a/llvm/test/MC/RISCV/rv32c-aliases-valid.s b/llvm/test/MC/RISCV/rv32c-aliases-valid.s index f688b27..f76c29f 100644 --- a/llvm/test/MC/RISCV/rv32c-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv32c-aliases-valid.s @@ -3,10 +3,10 @@ # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ # RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s -# RUN: llvm-mc -triple=riscv32 -mattr=+experimental-zca -riscv-no-aliases < %s \ +# RUN: llvm-mc -triple=riscv32 -mattr=+zca -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s -# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zca < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -d -M no-aliases - \ +# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zca < %s \ +# RUN: | llvm-objdump --mattr=+zca -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # The following check prefixes are used in this test: diff --git a/llvm/test/MC/RISCV/rv32c-invalid.s b/llvm/test/MC/RISCV/rv32c-invalid.s index 166476a..9fbd5e9 100644 --- a/llvm/test/MC/RISCV/rv32c-invalid.s +++ b/llvm/test/MC/RISCV/rv32c-invalid.s @@ -1,6 +1,6 @@ # RUN: not llvm-mc -triple=riscv32 -mattr=+c -mattr=+no-rvc-hints < %s 2>&1 \ # RUN: | FileCheck %s -# RUN: not llvm-mc -triple=riscv32 -mattr=+experimental-zca -mattr=+no-rvc-hints < %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv32 -mattr=+zca -mattr=+no-rvc-hints < %s 2>&1 \ # RUN: | FileCheck %s ## GPRC diff --git a/llvm/test/MC/RISCV/rv32c-valid.s b/llvm/test/MC/RISCV/rv32c-valid.s index d9c1b9c..4f561f2 100644 --- a/llvm/test/MC/RISCV/rv32c-valid.s +++ b/llvm/test/MC/RISCV/rv32c-valid.s @@ -3,20 +3,20 @@ # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c < %s \ # RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zca -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+zca -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zca < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zca < %s \ +# RUN: | llvm-objdump --mattr=+zca -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+c -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \ # RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zca -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+zca -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zca < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zca < %s \ +# RUN: | llvm-objdump --mattr=+zca -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # RUN: not llvm-mc -triple riscv32 \ diff --git a/llvm/test/MC/RISCV/rv32dc-valid.s b/llvm/test/MC/RISCV/rv32dc-valid.s index 804871f..0de1535 100644 --- a/llvm/test/MC/RISCV/rv32dc-valid.s +++ b/llvm/test/MC/RISCV/rv32dc-valid.s @@ -3,16 +3,16 @@ # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c,+d < %s \ # RUN: | llvm-objdump --mattr=+c,+d -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zcd,+d -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+zcd,+d -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zcd,+d < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zcd,+d -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zcd,+d < %s \ +# RUN: | llvm-objdump --mattr=+zcd,+d -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+c \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-D %s -# RUN: not llvm-mc -triple riscv32 -mattr=+experimental-zcd \ +# RUN: not llvm-mc -triple riscv32 -mattr=+zcd \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-D %s # RUN: not llvm-mc -triple riscv32 -riscv-no-aliases -show-encoding < %s 2>&1 \ diff --git a/llvm/test/MC/RISCV/rv32fc-valid.s b/llvm/test/MC/RISCV/rv32fc-valid.s index 55b8a63..4771880 100644 --- a/llvm/test/MC/RISCV/rv32fc-valid.s +++ b/llvm/test/MC/RISCV/rv32fc-valid.s @@ -3,16 +3,16 @@ # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c,+f < %s \ # RUN: | llvm-objdump --mattr=+c,+f -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zcf,+f -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+zcf,+f -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zcf,+f < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zcf,+f -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zcf,+f < %s \ +# RUN: | llvm-objdump --mattr=+zcf,+f -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+c \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-F %s -# RUN: not llvm-mc -triple riscv32 -mattr=+experimental-zcf \ +# RUN: not llvm-mc -triple riscv32 -mattr=+zcf \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-F %s # RUN: not llvm-mc -triple riscv32 \ @@ -21,7 +21,7 @@ # RUN: not llvm-mc -triple riscv64 -mattr=+c,+f \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-RV32 %s -# RUN: not llvm-mc -triple riscv64 -mattr=+experimental-zcf,+f \ +# RUN: not llvm-mc -triple riscv64 -mattr=+zcf,+f \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-RV32 %s diff --git a/llvm/test/MC/RISCV/rv32zcb-invalid.s b/llvm/test/MC/RISCV/rv32zcb-invalid.s index 9ffb029..2f543b2 100644 --- a/llvm/test/MC/RISCV/rv32zcb-invalid.s +++ b/llvm/test/MC/RISCV/rv32zcb-invalid.s @@ -1,6 +1,6 @@ -# RUN: not llvm-mc -triple=riscv32 -mattr=experimental-zcb -riscv-no-aliases -show-encoding %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv32 -mattr=zcb -riscv-no-aliases -show-encoding %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-ERROR %s -# RUN: not llvm-mc -triple=riscv64 -mattr=experimental-zcb -riscv-no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv64 -mattr=zcb -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-ERROR %s # CHECK-ERROR: error: immediate must be an integer in the range [0, 3] diff --git a/llvm/test/MC/RISCV/rv32zcb-valid.s b/llvm/test/MC/RISCV/rv32zcb-valid.s index 88f891e..edb1401 100644 --- a/llvm/test/MC/RISCV/rv32zcb-valid.s +++ b/llvm/test/MC/RISCV/rv32zcb-valid.s @@ -1,12 +1,12 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+m,+zbb,+zba,+experimental-zcb -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+m,+zbb,+zba,+zcb -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+m,+zbb,+zba,+experimental-zcb < %s \ -# RUN: | llvm-objdump --mattr=+m,+zbb,+zba,+experimental-zcb -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+m,+zbb,+zba,+zcb < %s \ +# RUN: | llvm-objdump --mattr=+m,+zbb,+zba,+zcb -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+m,+zbb,+zba,+experimental-zcb -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+m,+zbb,+zba,+zcb -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m,+zbb,+zba,+experimental-zcb < %s \ -# RUN: | llvm-objdump --mattr=+m,+zbb,+zba,experimental-zcb -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m,+zbb,+zba,+zcb < %s \ +# RUN: | llvm-objdump --mattr=+m,+zbb,+zba,zcb -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 \ diff --git a/llvm/test/MC/RISCV/rv32zcmp-invalid.s b/llvm/test/MC/RISCV/rv32zcmp-invalid.s index caa7424..cb99bba 100644 --- a/llvm/test/MC/RISCV/rv32zcmp-invalid.s +++ b/llvm/test/MC/RISCV/rv32zcmp-invalid.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -triple=riscv32 -mattr=experimental-zcmp -riscv-no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv32 -mattr=zcmp -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-ERROR %s # CHECK-ERROR: error: invalid operand for instruction diff --git a/llvm/test/MC/RISCV/rv32zcmp-valid.s b/llvm/test/MC/RISCV/rv32zcmp-valid.s index e9cfd58..31e287b 100644 --- a/llvm/test/MC/RISCV/rv32zcmp-valid.s +++ b/llvm/test/MC/RISCV/rv32zcmp-valid.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=experimental-zcmp -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=zcmp -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=experimental-zcmp < %s \ -# RUN: | llvm-objdump --mattr=-c,experimental-zcmp -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=zcmp < %s \ +# RUN: | llvm-objdump --mattr=-c,zcmp -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: cm.mvsa01 s1, s0 diff --git a/llvm/test/MC/RISCV/rv32zcmt-invalid.s b/llvm/test/MC/RISCV/rv32zcmt-invalid.s index d784dc4..5f964ed 100644 --- a/llvm/test/MC/RISCV/rv32zcmt-invalid.s +++ b/llvm/test/MC/RISCV/rv32zcmt-invalid.s @@ -1,6 +1,6 @@ -# RUN: not llvm-mc -triple=riscv32 -mattr=+experimental-zcmt -riscv-no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv32 -mattr=+zcmt -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-ERROR %s -# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-zcmt -riscv-no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv64 -mattr=+zcmt -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-ERROR %s # CHECK-ERROR: error: immediate must be an integer in the range [0, 31] diff --git a/llvm/test/MC/RISCV/rv32zcmt-valid.s b/llvm/test/MC/RISCV/rv32zcmt-valid.s index 75f6442..b3bcc92 100644 --- a/llvm/test/MC/RISCV/rv32zcmt-valid.s +++ b/llvm/test/MC/RISCV/rv32zcmt-valid.s @@ -1,17 +1,17 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zcmt\ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+zcmt\ # RUN: -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zcmt\ +# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zcmt\ # RUN: -mattr=m < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zcmt\ +# RUN: | llvm-objdump --mattr=+zcmt\ # RUN: -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zcmt\ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+zcmt\ # RUN: -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zcmt\ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zcmt\ # RUN: -mattr=m < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zcmt\ +# RUN: | llvm-objdump --mattr=+zcmt\ # RUN: -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s # diff --git a/llvm/test/MC/RISCV/rv64c-aliases-valid.s b/llvm/test/MC/RISCV/rv64c-aliases-valid.s index da38e6d..df985a3 100644 --- a/llvm/test/MC/RISCV/rv64c-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv64c-aliases-valid.s @@ -3,10 +3,10 @@ # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c < %s \ # RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s -# RUN: llvm-mc -triple=riscv64 -mattr=+experimental-zca -riscv-no-aliases < %s \ +# RUN: llvm-mc -triple=riscv64 -mattr=+zca -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s -# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+experimental-zca < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -d -M no-aliases - \ +# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+zca < %s \ +# RUN: | llvm-objdump --mattr=+zca -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # The following check prefixes are used in this test: diff --git a/llvm/test/MC/RISCV/rv64c-hints-valid.s b/llvm/test/MC/RISCV/rv64c-hints-valid.s index 6f92509..441aa57 100644 --- a/llvm/test/MC/RISCV/rv64c-hints-valid.s +++ b/llvm/test/MC/RISCV/rv64c-hints-valid.s @@ -3,10 +3,10 @@ # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \ # RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple riscv64 -mattr=+experimental-zca -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple riscv64 -mattr=+zca -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zca < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zca -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zca < %s \ +# RUN: | llvm-objdump --mattr=+zca -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: c.slli zero, 63 diff --git a/llvm/test/MC/RISCV/rv64c-invalid.s b/llvm/test/MC/RISCV/rv64c-invalid.s index 4d7233b..aecc3b4 100644 --- a/llvm/test/MC/RISCV/rv64c-invalid.s +++ b/llvm/test/MC/RISCV/rv64c-invalid.s @@ -1,5 +1,5 @@ # RUN: not llvm-mc -triple=riscv64 -mattr=+c < %s 2>&1 | FileCheck %s -# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-zca < %s 2>&1 | FileCheck %s +# RUN: not llvm-mc -triple=riscv64 -mattr=+zca < %s 2>&1 | FileCheck %s ## GPRC c.ld ra, 4(sp) # CHECK: :[[@LINE]]:6: error: invalid operand for instruction diff --git a/llvm/test/MC/RISCV/rv64c-valid.s b/llvm/test/MC/RISCV/rv64c-valid.s index cd835a9..6076e9b 100644 --- a/llvm/test/MC/RISCV/rv64c-valid.s +++ b/llvm/test/MC/RISCV/rv64c-valid.s @@ -3,7 +3,7 @@ # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \ # RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zca -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+zca -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \ # RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \ diff --git a/llvm/test/MC/RISCV/rv64dc-valid.s b/llvm/test/MC/RISCV/rv64dc-valid.s index 7f39fa9..97d36db 100644 --- a/llvm/test/MC/RISCV/rv64dc-valid.s +++ b/llvm/test/MC/RISCV/rv64dc-valid.s @@ -3,16 +3,16 @@ # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c,+d < %s \ # RUN: | llvm-objdump --mattr=+c,+d -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zcd,+d -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+zcd,+d -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zcd,+d < %s \ -# RUN: | llvm-objdump --mattr=+experimental-zcd,+d -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zcd,+d < %s \ +# RUN: | llvm-objdump --mattr=+zcd,+d -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv64 -mattr=+c \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-D %s -# RUN: not llvm-mc -triple riscv64 -mattr=+experimental-zcd \ +# RUN: not llvm-mc -triple riscv64 -mattr=+zcd \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-D %s # RUN: not llvm-mc -triple riscv64 -riscv-no-aliases -show-encoding < %s 2>&1 \ diff --git a/llvm/test/MC/RISCV/rv64zcb-valid.s b/llvm/test/MC/RISCV/rv64zcb-valid.s index c41997f..ab0550e 100644 --- a/llvm/test/MC/RISCV/rv64zcb-valid.s +++ b/llvm/test/MC/RISCV/rv64zcb-valid.s @@ -1,13 +1,13 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+m,+zbb,+zba,+experimental-zcb -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+m,+zbb,+zba,+zcb -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m,+zbb,+zba,+experimental-zcb < %s \ -# RUN: | llvm-objdump --mattr=+m,+zbb,+zba,experimental-zcb -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m,+zbb,+zba,+zcb < %s \ +# RUN: | llvm-objdump --mattr=+m,+zbb,+zba,zcb -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv64 \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s -# RUN: not llvm-mc -triple riscv32 -mattr=+m,+zbb,+zba,+experimental-zcb \ +# RUN: not llvm-mc -triple riscv32 -mattr=+m,+zbb,+zba,+zcb \ # RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-RV64 %s diff --git a/llvm/test/MC/RISCV/rv64zcmp-invalid.s b/llvm/test/MC/RISCV/rv64zcmp-invalid.s index 61845ba..1039345 100644 --- a/llvm/test/MC/RISCV/rv64zcmp-invalid.s +++ b/llvm/test/MC/RISCV/rv64zcmp-invalid.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -triple=riscv64 -mattr=experimental-zcmp -riscv-no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple=riscv64 -mattr=zcmp -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-ERROR %s # CHECK-ERROR: error: invalid operand for instruction diff --git a/llvm/test/MC/RISCV/rv64zcmp-valid.s b/llvm/test/MC/RISCV/rv64zcmp-valid.s index 227940a..5973f6d 100644 --- a/llvm/test/MC/RISCV/rv64zcmp-valid.s +++ b/llvm/test/MC/RISCV/rv64zcmp-valid.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=experimental-zcmp -riscv-no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=zcmp -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=experimental-zcmp < %s \ -# RUN: | llvm-objdump --mattr=-c,experimental-zcmp -M no-aliases -d -r - \ +# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=zcmp < %s \ +# RUN: | llvm-objdump --mattr=-c,zcmp -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: cm.mvsa01 s1, s0 diff --git a/llvm/test/MC/RISCV/rvzcmt-user-csr-name.s b/llvm/test/MC/RISCV/rvzcmt-user-csr-name.s index 0036981..58fe43e 100644 --- a/llvm/test/MC/RISCV/rvzcmt-user-csr-name.s +++ b/llvm/test/MC/RISCV/rvzcmt-user-csr-name.s @@ -1,13 +1,13 @@ -# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -mattr=+experimental-zcmt -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -mattr=+zcmt -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s -# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+experimental-zcmt < %s \ -# RUN: | llvm-objdump -d --mattr=+experimental-zcmt - \ +# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zcmt < %s \ +# RUN: | llvm-objdump -d --mattr=+zcmt - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s # -# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -mattr=+experimental-zcmt -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -mattr=+zcmt -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s -# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+experimental-zcmt < %s \ -# RUN: | llvm-objdump -d --mattr=+experimental-zcmt - \ +# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+zcmt < %s \ +# RUN: | llvm-objdump -d --mattr=+zcmt - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s ##################################