Add new experimental instruction class (chipsalliance#323)

run.py

@@ -553,8 +553,11 @@ def main():
     elif args.target == "ml":
       args.mabi = "lp64"
       args.isa  = "rv64imc"
+    elif args.target == "exp":
+      args.mabi = "lp64"
+      args.isa  = "rv64gc"
     else:
-      print ("Unsupported pre-defined target: %0s" % args.target)
+      sys.exit("Unsupported pre-defined target: %0s" % args.target)
   else:
     if re.match(".*gcc_compile.*", args.steps) or re.match(".*iss_sim.*", args.steps):
       if (not args.mabi) or (not args.isa):

src/isa/riscv_amo_instr.sv

@@ -0,0 +1,60 @@
+class riscv_amo_instr extends riscv_instr;
+
+  rand bit aq;
+  rand bit rl;
+
+  constraint aq_rl_c {
+    aq && rl == 0;
+  }
+
+  `uvm_object_utils(riscv_amo_instr)
+
+  function new(string name = "");
+    super.new(name);
+  endfunction
+
+  virtual function string get_instr_name();
+    get_instr_name = instr_name.name();
+    if (group == RV32A) begin
+      get_instr_name = {get_instr_name.substr(0, get_instr_name.len() - 3), ".w"};
+      get_instr_name = aq ? {get_instr_name, ".aq"} :
+                       rl ? {get_instr_name, ".rl"} : get_instr_name;
+    end else if (group == RV64A) begin
+      get_instr_name = {get_instr_name.substr(0, get_instr_name.len() - 3), ".d"};
+      get_instr_name = aq ? {get_instr_name, ".aq"} :
+                       rl ? {get_instr_name, ".rl"} : get_instr_name;
+    end else begin
+      `uvm_fatal(`gfn, $sformatf("Unexpected amo instr group: %0s / %0s",
+                                 group.name(), instr_name.name()))
+    end
+    return get_instr_name;
+  endfunction : get_instr_name
+
+  // Convert the instruction to assembly code
+  virtual function string convert2asm(string prefix = "");
+    string asm_str;
+    asm_str = format_string(get_instr_name(), MAX_INSTR_STR_LEN);
+    if (group inside {RV32A, RV64A}) begin
+      if (instr_name inside {LR_W, LR_D}) begin
+        asm_str = $sformatf("%0s %0s, (%0s)", asm_str, rd.name(), rs1.name());
+      end else begin
+        asm_str = $sformatf("%0s %0s, %0s, (%0s)", asm_str, rd.name(), rs2.name(), rs1.name());
+      end
+    end else begin
+      `uvm_fatal(`gfn, $sformatf("Unexpected amo instr group: %0s / %0s",
+                                 group.name(), instr_name.name()))
+    end
+    if(comment != "")
+      asm_str = {asm_str, " #",comment};
+    return asm_str.tolower();
+  endfunction : convert2asm
+
+  virtual function void do_copy(uvm_object rhs);
+    riscv_amo_instr rhs_;
+    super.copy(rhs);
+    assert($cast(rhs_, rhs));
+    this.aq = rhs_.aq;
+    this.rl = rhs_.rl;
+  endfunction : do_copy
+
+endclass