[vm] Remove RV_Zbc from RV_B.

The B Standard Extension has been ratified as Zba + Zbb + Zbs. TEST=ci Change-Id: Ifad5d68104e8f98e49a34e5a5ae76fa13c377b38 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/365988 Commit-Queue: Ryan Macnak <rmacnak@google.com> Reviewed-by: Alexander Aprelev <aam@google.com>
dart-lang · May 13, 2024 · aac993f · aac993f
1 parent 1269613
commit aac993f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/runtime/vm/compiler/assembler/assembler_riscv_test.cc b/runtime/vm/compiler/assembler/assembler_riscv_test.cc
@@ -6767,7 +6767,7 @@ ASSEMBLER_TEST_RUN(ByteReverse, test) {
 }
 
 ASSEMBLER_TEST_GENERATE(CarrylessMultiply, assembler) {
-  __ SetExtensions(RV_GCB);
+  __ SetExtensions(RV_GC | RV_Zbc);
   __ clmul(A0, A0, A1);
   __ ret();
 }
@@ -6797,7 +6797,7 @@ ASSEMBLER_TEST_RUN(CarrylessMultiply, test) {
 }
 
 ASSEMBLER_TEST_GENERATE(CarrylessMultiplyHigh, assembler) {
-  __ SetExtensions(RV_GCB);
+  __ SetExtensions(RV_GC | RV_Zbc);
   __ clmulh(A0, A0, A1);
   __ ret();
 }
@@ -6827,7 +6827,7 @@ ASSEMBLER_TEST_RUN(CarrylessMultiplyHigh, test) {
 }
 
 ASSEMBLER_TEST_GENERATE(CarrylessMultiplyReversed, assembler) {
-  __ SetExtensions(RV_GCB);
+  __ SetExtensions(RV_GC | RV_Zbc);
   __ clmulr(A0, A0, A1);
   __ ret();
 }

diff --git a/runtime/vm/constants_riscv.h b/runtime/vm/constants_riscv.h
@@ -1594,10 +1594,10 @@ static constexpr ExtensionSet RV_G = RV_I | RV_M | RV_A | RV_F | RV_D;
 static constexpr ExtensionSet RV_GC = RV_G | RV_C;
 static constexpr Extension RV_Zba(6);  // Address generation
 static constexpr Extension RV_Zbb(7);  // Basic bit-manipulation
-static constexpr Extension RV_Zbc(8);  // Carry-less multiplication
-static constexpr Extension RV_Zbs(9);  // Single-bit instructions
-static constexpr ExtensionSet RV_B = RV_Zba | RV_Zbb | RV_Zbc | RV_Zbs;
+static constexpr Extension RV_Zbs(8);  // Single-bit instructions
+static constexpr ExtensionSet RV_B = RV_Zba | RV_Zbb | RV_Zbs;
 static constexpr ExtensionSet RV_GCB = RV_GC | RV_B;
+static constexpr Extension RV_Zbc(9);  // Carry-less multiplication
 
 #undef R