[RISCV] Add support for the Zawrs extension

[palmer-dabbelt]

Summary

This extension contains a single instruction, wrs, which waits for the
current reservation set to be modified by a remote agent.

Signed-off-by: Palmer Dabbelt <[e-mail]>

---

This is still some sort of very early draft and I'm not sure what the
rules are in LLVM land for merging that sort of code. It's a fast track
extension so it should be done soon, but it's been drifting around a bit
as part of that process so this might not be sane right now. I'm really
just doing this to check the box on LLVM support, which is just
assembler support due to the nature of the WRS instruction.

I also haven't gotten clang-format working yet, but I'm hoping something
in the CI will help with that.

[palmer-dabbelt]

I've never touched LLVM before, so I have no idea if I'm even in the right place here...

[eopXD]

llvm/lib/Target/RISCV/RISCVInstrInfoZawrs.td

2

This doesn't match the filename.

[eopXD]

In D128235#3597645, @palmer-dabbelt wrote:

I've never touched LLVM before, so I have no idea if I'm even in the right place here...

Yes, you are in the right place.
All LLVM patches go through the Phabricator.
A patch goes in when at least one person accepts it.

[eopXD]

• I think we will need some test coverage under llvm/test/CodeGen/RISCV/attributes.ll and llvm/test/MC/RISCV/attribute-arch.s if the extension is existing in the arch string.
• Since macro was added, we need some test coverage under clang/test/Preprocessor/riscv-target-features.c
• There are also some test cases for error handling under clang/test/Driver/riscv-arch.c, maybe add some there too?

[palmer-dabbelt]

• Fix a whitespace issue
• Fix the name of RISCVInstrInfoZawrs.td
• Call the #define riscv_zawrs instead of riscv_wrs, to match the others
• Add tests in clang/test/Driver/riscv-arch.c, clang/test/Preprocessor/riscv-target-features.c, llvm/test/CodeGen/RISCV/attributes.ll

The clang tests aren't running for me, presumably because clang isn't building locally. Also hoping to rely on CI for that one, but I'm not entirely sure.

[eopXD]

Looks like the patch application failed, might need to rebase.

[craig.topper]

clang/test/Driver/riscv-arch.c

585

This doesn't match the RUN line

589

This doesn't match the RUN line

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

444

This CHECK directive doesn't match the RUN line

[MaskRay]

Context not available.

See -U999999 on https://llvm.org/docs/Phabricator.html#requesting-a-review-via-the-web-interface or use arc diff (PHP 8 may need https://discourse.llvm.org/t/arcanist-deprecation-errors-on-php-8/63231)

llvm/test/MC/RISCV/zawrs-valid.s

2

The convention is to use --check-prefix is there is only one prefix.

12

Append {{$}} to make the test stricter.

[MaskRay]

llvm/test/MC/RISCV/zawrs-invalid.s

4

[[@LINE]] is a deprecated FileCheck feature.

Use [[#@LINE]]

Note: you can place negative tests with the positive test file. Search .ifndef err.

[kito-cheng]

clang/lib/Basic/Targets/RISCV.cpp

195

You don't need this line, that would be defined automatically once you've add zawrs in RISCVISAInfo.cpp, see the loop in the earlier in this function, it's done by there:

for (auto &Extension : ISAInfo->getExtensions()) {
  auto ExtName = Extension.first;
  auto ExtInfo = Extension.second;
  unsigned Version =
      (ExtInfo.MajorVersion * 1000000) + (ExtInfo.MinorVersion * 1000);

  Builder.defineMacro(Twine("__riscv_", ExtName), Twine(Version));
}

[asb]

This is still some sort of very early draft and I'm not sure what the rules are in LLVM land for merging that sort of code. It's a fast track extension so it should be done soon

The policy we ended up with is that support for not-yet-ratified extensions can be merged, but they're made to stick out like a sore thumb by calling the feature -experimental-foo and requiring -menable-experimental-extensions in clang. Given the simplicity of zawrs there's substantially less scope for drastic changes, but I think conforming to that is probably the best patch forwards. You should be able to see an example by looking at one of the stalled bitmanip extensions, e.g. experimental-zbp.

[palmer-dabbelt]

I was talking to @reames about this. The spec has changed since I posted these patches: there's now two instructions (wrs.nto and wrs.sto) and there's no longer a register to encode the timeout.

clang/lib/Basic/Targets/RISCV.cpp

 
   if (ISAInfo->hasExtension("zve32x"))
     Builder.defineMacro("__riscv_vector");
+
+  if (ISAInfo->hasExtension("zawrs"))
+    Builder.defineMacro("__riscv_zawrs");
 }
 
 const Builtin::Info RISCVTargetInfo::BuiltinInfo[] = {

clang/test/Driver/riscv-arch.c

 // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZHINX-BADVERS %s
 // RV32-ZHINX-BADVERS: error: invalid arch name 'rv32izhinx0p1'
 // RV32-ZHINX-BADVERS: unsupported version number 0.1 for extension 'zhinx'
+
+// RUN: %clang --target=riscv32-unknown-elf -march=rv32izawrs1p0 -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZAWRS-GOOD %s
+// RV32-ZHINX-GOOD: "-target-feature" "+zawrs"
+
+// RUN: %clang --target=riscv64-unknown-elf -march=rv64izawrs1p0 -### %s \
+// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV64-ZAWRS-GOOD %s
+// RV64-ZHINX-GOOD: "-target-feature" "+zawrs"

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

 // CHECK-NOT: __riscv_zkr
 // CHECK-NOT: __riscv_zkt
 // CHECK-NOT: __riscv_zk
+// CHECK-NOT: __riscv_zawrs
 
 // RUN: %clang -target riscv32-unknown-linux-gnu -march=rv32im -x c -E -dM %s \
 // RUN: -o - | FileCheck --check-prefix=CHECK-M-EXT %s

 // RUN: -march=rv64i_zbkb_zbkc_zbkx_zksed_zksh -x c -E -dM %s -o - \
 // RUN: | FileCheck --check-prefix=CHECK-COMBINE-INTO-ZKS %s
 // CHECK-COMBINE-INTO-ZKS: __riscv_zks 1
+
+// RUN: %clang -target riscv32-unknown-linux-gnu \
+// RUN: -march=rv32i_zawrs -x c -E -dM %s -o - \
+// RUN: | FileCheck --check-prefix=CHECK-ZAWRS %s
+// RUN: %clang -target riscv64-unknown-linux-gnu \
+// RUN: -march=rv64i_zawrs -x c -E -dM %s -o - \
+// RUN: | FileCheck --check-prefix=CHECK-ZAWRS %s
+// CHECK-COMBINE-INTO-ZKS: __riscv_zawrs 1

llvm/lib/Support/RISCVISAInfo.cpp

 
     {"zihintpause", RISCVExtensionVersion{2, 0}},
 
+    {"zawrs", RISCVExtensionVersion{1, 0}},
+
     {"zfhmin", RISCVExtensionVersion{1, 0}},
     {"zfh", RISCVExtensionVersion{1, 0}},
 

llvm/lib/Target/RISCV/RISCV.td

                        "'Zvfh' (Vector Half-Precision Floating-Point)",
                        [FeatureStdExtZve32f]>;
 
+def FeatureStdExtZawrs
+    : SubtargetFeature<"zawrs", "HasStdExtZawrs", "true",
+                       "'Zawrs' (Wait Reservation Set)">;
+def HasStdExtZawrs
+    : Predicate<"Subtarget->hasStdExtZawrs">,
+                AssemblerPredicate<(any_of FeatureStdExtZawrs),
+                                   "'Zawrs' (Wait Reservation Set) ">;
+
 def Feature64Bit
     : SubtargetFeature<"64bit", "HasRV64", "true", "Implements RV64">;
 def IsRV64 : Predicate<"Subtarget->is64Bit()">,

llvm/lib/Target/RISCV/RISCVInstrInfo.td

 include "RISCVInstrInfoZk.td"
 include "RISCVInstrInfoV.td"
 include "RISCVInstrInfoZfh.td"
+include "RISCVInstrInfoZawrs.td"

llvm/lib/Target/RISCV/RISCVInstrInfoZawrs.td

+//===-- RISCVInstrInfoZawrs.td - RISC-V 'Zawrs' instructions -------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file describes the RISC-V instructions from the standard 'Zawrs', Wait
+// Reservation Set, extension.
+//
+//===----------------------------------------------------------------------===//
+
+let Predicates = [HasStdExtZawrs], hasSideEffects = 1, mayStore = 0, mayLoad = 0 in {
+  def WRS : RVInstI<0b000, OPC_SYSTEM, (outs), (ins GPR:$rs1), "wrs", "$rs1">, Sched<[]> {
+    let rd = 0;
+    let imm12 = 0x010;
+  }
+}
+
+def : InstAlias<"wrs", (WRS X0)>;

llvm/lib/Target/RISCV/RISCVSubtarget.h

   bool HasStdExtZks = false;
   bool HasStdExtZkt = false;
   bool HasStdExtZk = false;
+  bool HasStdExtZawrs = false;
   bool HasRV64 = false;
   bool IsRV32E = false;
   bool EnableLinkerRelax = false;

   bool hasStdExtZksed() const { return HasStdExtZksed; }
   bool hasStdExtZksh() const { return HasStdExtZksh; }
   bool hasStdExtZkr() const { return HasStdExtZkr; }
+  bool hasStdExtZawrs() const { return HasStdExtZawrs; }
   bool is64Bit() const { return HasRV64; }
   bool isRV32E() const { return IsRV32E; }
   bool enableLinkerRelax() const { return EnableLinkerRelax; }

llvm/test/CodeGen/RISCV/attributes.ll

 ; RUN: llc -mtriple=riscv32 -mattr=+zkn,+zkr,+zkt %s -o - | FileCheck --check-prefix=RV32COMBINEINTOZK %s
 ; RUN: llc -mtriple=riscv32 -mattr=+zbkb,+zbkc,+zbkx,+zkne,+zknd,+zknh %s -o - | FileCheck --check-prefix=RV32COMBINEINTOZKN %s
 ; RUN: llc -mtriple=riscv32 -mattr=+zbkb,+zbkc,+zbkx,+zksed,+zksh %s -o - | FileCheck --check-prefix=RV32COMBINEINTOZKS %s
+; RUN: llc -mtriple=riscv32 -mattr=+zawrs %s -o - | FileCheck --check-prefix=RV32ZAWRS %s
 ; RUN: llc -mtriple=riscv64 -mattr=+m %s -o - | FileCheck --check-prefix=RV64M %s
 ; RUN: llc -mtriple=riscv64 -mattr=+a %s -o - | FileCheck --check-prefix=RV64A %s
 ; RUN: llc -mtriple=riscv64 -mattr=+f %s -o - | FileCheck --check-prefix=RV64F %s

 ; RUN: llc -mtriple=riscv64 -mattr=+zkn,+zkr,+zkt %s -o - | FileCheck --check-prefix=RV64COMBINEINTOZK %s
 ; RUN: llc -mtriple=riscv64 -mattr=+zbkb,+zbkc,+zbkx,+zkne,+zknd,+zknh %s -o - | FileCheck --check-prefix=RV64COMBINEINTOZKN %s
 ; RUN: llc -mtriple=riscv64 -mattr=+zbkb,+zbkc,+zbkx,+zksed,+zksh %s -o - | FileCheck --check-prefix=RV64COMBINEINTOZKS %s
+; RUN: llc -mtriple=riscv64 -mattr=+zawrs %s -o - | FileCheck --check-prefix=RV64ZAWRS %s
 
 ; RV32M: .attribute 5, "rv32i2p0_m2p0"
 ; RV32A: .attribute 5, "rv32i2p0_a2p0"

 ; RV32COMBINEINTOZK: .attribute 5, "rv32i2p0_zbkb1p0_zbkc1p0_zbkx1p0_zk1p0_zkn1p0_zknd1p0_zkne1p0_zknh1p0_zkr1p0_zkt1p0"
 ; RV32COMBINEINTOZKN: .attribute 5, "rv32i2p0_zbkb1p0_zbkc1p0_zbkx1p0_zkn1p0_zknd1p0_zkne1p0_zknh1p0"
 ; RV32COMBINEINTOZKS: .attribute 5, "rv32i2p0_zbkb1p0_zbkc1p0_zbkx1p0_zks1p0_zksed1p0_zksh1p0"
+; RV32ZAWRS: .attribute 5, "rv32i2p0_zawrs1p0"
 
 ; RV64M: .attribute 5, "rv64i2p0_m2p0"
 ; RV64A: .attribute 5, "rv64i2p0_a2p0"

 ; RV64COMBINEINTOZK: .attribute 5, "rv64i2p0_zbkb1p0_zbkc1p0_zbkx1p0_zk1p0_zkn1p0_zknd1p0_zkne1p0_zknh1p0_zkr1p0_zkt1p0"
 ; RV64COMBINEINTOZKN: .attribute 5, "rv64i2p0_zbkb1p0_zbkc1p0_zbkx1p0_zkn1p0_zknd1p0_zkne1p0_zknh1p0"
 ; RV64COMBINEINTOZKS: .attribute 5, "rv64i2p0_zbkb1p0_zbkc1p0_zbkx1p0_zks1p0_zksed1p0_zksh1p0"
+; RV64ZAWRS: .attribute 5, "rv64i2p0_zawrs1p0"
 
 define i32 @addi(i32 %a) {
   %1 = add i32 %a, 1

llvm/test/MC/RISCV/zawrs-invalid.s

+# RUN: not llvm-mc -triple riscv64 -mattr=+a < %s 2>&1 | FileCheck %s
+
+# WRS doesn't take immediates
+wrs 1 # CHECK: :[[@LINE]]:5: error: invalid operand for instruction
+
+# WRS only takes at most a single register
+wrs t0, 1 # CHECK: :[[@LINE]]:9: error: invalid operand for instruction
+wrs t0, t0 # CHECK: :[[@LINE]]:9: error: invalid operand for instruction

llvm/test/MC/RISCV/zawrs-valid.s

+# RUN: llvm-mc %s -triple=riscv32 -mattr=+zawrs \
+# RUN:     | FileCheck -check-prefixes=CHECK-S-OBJ %s
+# RUN: llvm-mc %s -triple=riscv64 -mattr=+zawrs \
+# RUN:     | FileCheck -check-prefixes=CHECK-S-OBJ %s
+# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+zawrs < %s \
+# RUN:     | llvm-objdump --mattr=+zawrs -d -r - \
+# RUN:     | FileCheck -check-prefixes=CHECK-S-OBJ %s
+# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+zawrs < %s \
+# RUN:     | llvm-objdump --mattr=+zawrs -d -r - \
+# RUN:     | FileCheck -check-prefixes=CHECK-S-OBJ %s
+
+# CHECK-S-OBJ: wrs
+wrs
+
+# CHECK-S-OBJ: wrs t0
+wrs t0