Skip to content

Commit 681bd80

Browse files
authored
[RISCV] Bump Zalasr version to 0.9. (#162329)
Update doc repository link.
1 parent 1a9efac commit 681bd80

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

clang/test/Driver/print-supported-extensions-riscv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
// CHECK-NEXT: zibi 0.1 'Zibi' (Branch with Immediate)
217217
// CHECK-NEXT: zicfilp 1.0 'Zicfilp' (Landing pad)
218218
// CHECK-NEXT: zicfiss 1.0 'Zicfiss' (Shadow stack)
219-
// CHECK-NEXT: zalasr 0.1 'Zalasr' (Load-Acquire and Store-Release Instructions)
219+
// CHECK-NEXT: zalasr 0.9 'Zalasr' (Load-Acquire and Store-Release Instructions)
220220
// CHECK-NEXT: zvbc32e 0.7 'Zvbc32e' (Vector Carryless Multiplication with 32-bits elements)
221221
// CHECK-NEXT: zvfbfa 0.1 'Zvfbfa' (Additional BF16 vector compute support)
222222
// CHECK-NEXT: zvfofp8min 0.2 'Zvfofp8min' (Vector OFP8 Converts)

clang/test/Driver/riscv-arch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@
384384
// RUN: not %clang --target=riscv32-unknown-elf -march=rv32izalasr0p7 -menable-experimental-extensions -### %s \
385385
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-BADVERS %s
386386
// RV32-EXPERIMENTAL-BADVERS: error: invalid arch name 'rv32izalasr0p7'
387-
// RV32-EXPERIMENTAL-BADVERS: unsupported version number 0.7 for experimental extension 'zalasr' (this compiler supports 0.1)
387+
// RV32-EXPERIMENTAL-BADVERS: unsupported version number 0.7 for experimental extension 'zalasr' (this compiler supports 0.9)
388388

389-
// RUN: %clang --target=riscv32-unknown-elf -march=rv32izalasr0p1 -menable-experimental-extensions -### %s \
389+
// RUN: %clang --target=riscv32-unknown-elf -march=rv32izalasr0p9 -menable-experimental-extensions -### %s \
390390
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-GOODVERS %s
391391
// RV32-EXPERIMENTAL-GOODVERS: "-target-feature" "+experimental-zalasr"
392392

clang/test/Preprocessor/riscv-target-features.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,12 +1531,12 @@
15311531

15321532
// Experimental extensions
15331533
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
1534-
// RUN: -march=rv32i_zalasr0p1 -E -dM %s \
1534+
// RUN: -march=rv32i_zalasr0p9 -E -dM %s \
15351535
// RUN: -o - | FileCheck --check-prefix=CHECK-ZALASR-EXT %s
15361536
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
1537-
// RUN: -march=rv64i_zalasr0p1 -E -dM %s \
1537+
// RUN: -march=rv64i_zalasr0p9 -E -dM %s \
15381538
// RUN: -o - | FileCheck --check-prefix=CHECK-ZALASR-EXT %s
1539-
// CHECK-ZALASR-EXT: __riscv_zalasr 1000{{$}}
1539+
// CHECK-ZALASR-EXT: __riscv_zalasr 9000{{$}}
15401540

15411541
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
15421542
// RUN: -march=rv32izfbfmin1p0 -E -dM %s \

llvm/docs/RISCVUsage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ LLVM supports (to various degrees) a number of experimental extensions. All exp
334334
The primary goal of experimental support is to assist in the process of ratification by providing an existence proof of an implementation, and simplifying efforts to validate the value of a proposed extension against large code bases. Experimental extensions are expected to either transition to ratified status, or be eventually removed. The decision on whether to accept an experimental extension is currently done on an entirely case by case basis; if you want to propose one, attending the bi-weekly RISC-V sync-up call is strongly advised.
335335

336336
``experimental-zalasr``
337-
LLVM implements the `0.0.5 draft specification <https://github.com/mehnadnerd/riscv-zalasr>`__.
337+
LLVM implements the `0.9 draft specification <https://github.com/riscv/riscv-zalasr/releases/tag/v0.9>`__.
338338

339339
``experimental-zibi``
340340
LLVM implements the `0.1 release specification <https://github.com/riscv/zibi/releases/tag/v0.1.0>`__.

llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def HasStdExtZacas : Predicate<"Subtarget->hasStdExtZacas()">,
265265
def NoStdExtZacas : Predicate<"!Subtarget->hasStdExtZacas()">;
266266

267267
def FeatureStdExtZalasr
268-
: RISCVExperimentalExtension<0, 1, "Load-Acquire and Store-Release Instructions">;
268+
: RISCVExperimentalExtension<0, 9, "Load-Acquire and Store-Release Instructions">;
269269
def HasStdExtZalasr : Predicate<"Subtarget->hasStdExtZalasr()">,
270270
AssemblerPredicate<(all_of FeatureStdExtZalasr),
271271
"'Zalasr' (Load-Acquire and Store-Release Instructions)">;

llvm/test/CodeGen/RISCV/attributes.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
; RV32ZVFBFWMA: .attribute 5, "rv32i2p1_f2p2_zicsr2p0_zfbfmin1p0_zve32f1p0_zve32x1p0_zvfbfmin1p0_zvfbfwma1p0_zvl32b1p0"
444444
; RV32ZVFOFP8MIN: .attribute 5, "rv32i2p1_f2p2_zicsr2p0_zve32f1p0_zve32x1p0_zvfofp8min0p2_zvl32b1p0"
445445
; RV32ZACAS: .attribute 5, "rv32i2p1_zaamo1p0_zacas1p0"
446-
; RV32ZALASR: .attribute 5, "rv32i2p1_zalasr0p1"
446+
; RV32ZALASR: .attribute 5, "rv32i2p1_zalasr0p9"
447447
; RV32ZAMA16B: .attribute 5, "rv32i2p1_zama16b1p0"
448448
; RV32ZICFILP: .attribute 5, "rv32i2p1_zicfilp1p0_zicsr2p0"
449449
; RV32ZABHA: .attribute 5, "rv32i2p1_zaamo1p0_zabha1p0"
@@ -590,8 +590,8 @@
590590
; RV64ZVFBFWMA: .attribute 5, "rv64i2p1_f2p2_zicsr2p0_zfbfmin1p0_zve32f1p0_zve32x1p0_zvfbfmin1p0_zvfbfwma1p0_zvl32b1p0"
591591
; RV64ZVFOFP8MIN: .attribute 5, "rv64i2p1_f2p2_zicsr2p0_zve32f1p0_zve32x1p0_zvfofp8min0p2_zvl32b1p0"
592592
; RV64ZACAS: .attribute 5, "rv64i2p1_zaamo1p0_zacas1p0"
593-
; RV64ZALASR: .attribute 5, "rv64i2p1_zalasr0p1"
594-
; RV64ZALASRA: .attribute 5, "rv64i2p1_a2p1_zaamo1p0_zalasr0p1_zalrsc1p0"
593+
; RV64ZALASR: .attribute 5, "rv64i2p1_zalasr0p9"
594+
; RV64ZALASRA: .attribute 5, "rv64i2p1_a2p1_zaamo1p0_zalasr0p9_zalrsc1p0"
595595
; RV64ZICFILP: .attribute 5, "rv64i2p1_zicfilp1p0_zicsr2p0"
596596
; RV64ZABHA: .attribute 5, "rv64i2p1_zaamo1p0_zabha1p0"
597597
; RV64ZVBC32E: .attribute 5, "rv64i2p1_zicsr2p0_zvbc32e0p7_zve32x1p0_zvl32b1p0"

llvm/test/MC/RISCV/attribute-arch.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@
420420
.attribute arch, "rv32ia_zacas1p0"
421421
# CHECK: attribute 5, "rv32i2p1_a2p1_zaamo1p0_zacas1p0_zalrsc1p0"
422422

423-
.attribute arch, "rv32izalasr0p1"
424-
# CHECK: attribute 5, "rv32i2p1_zalasr0p1"
423+
.attribute arch, "rv32izalasr0p9"
424+
# CHECK: attribute 5, "rv32i2p1_zalasr0p9"
425425

426426
.attribute arch, "rv32i_xcvalu"
427427
# CHECK: attribute 5, "rv32i2p1_xcvalu1p0"

llvm/unittests/TargetParser/RISCVISAInfoTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ TEST(ParseArchString,
552552
const auto &Exts = (*MaybeISAInfo)->getExtensions();
553553
EXPECT_EQ(Exts.size(), 2UL);
554554
EXPECT_EQ(Exts.count("zalasr"), 1U);
555-
auto MaybeISAInfo2 = RISCVISAInfo::parseArchString("rv64izalasr0p1", true);
555+
auto MaybeISAInfo2 = RISCVISAInfo::parseArchString("rv64izalasr0p9", true);
556556
ASSERT_THAT_EXPECTED(MaybeISAInfo2, Succeeded());
557557
const auto &Exts2 = (*MaybeISAInfo2)->getExtensions();
558558
EXPECT_EQ(Exts2.size(), 2UL);
@@ -581,7 +581,7 @@ TEST(ParseArchString, RejectsUnrecognizedVersionForExperimentalExtension) {
581581
toString(
582582
RISCVISAInfo::parseArchString("rv64izalasr9p9", true).takeError()),
583583
"unsupported version number 9.9 for experimental extension 'zalasr' "
584-
"(this compiler supports 0.1)");
584+
"(this compiler supports 0.9)");
585585
}
586586

587587
TEST(ParseArchString, RejectsExtensionVersionForG) {
@@ -1188,7 +1188,7 @@ Experimental extensions
11881188
zibi 0.1
11891189
zicfilp 1.0 This is a long dummy description
11901190
zicfiss 1.0
1191-
zalasr 0.1
1191+
zalasr 0.9
11921192
zvbc32e 0.7
11931193
zvfbfa 0.1
11941194
zvfofp8min 0.2

0 commit comments

Comments
 (0)