🐛 fix march-string to generic conversion

stnolting · May 12, 2023 · 5ec8790 · 5ec8790
1 parent 7357ae8
commit 5ec8790
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/plugin-neorv32/riscof_neorv32.py b/plugin-neorv32/riscof_neorv32.py
@@ -174,17 +174,13 @@ def runTests(self, testList):
           # prepare run of GHDL simulation
           execute = 'sh ./sim/ghdl_run.sh'
           # set TB generics according to MARCH test case
-          if "e" in marchstr:
-              execute += ' -gRISCV_E=true'
-          if "m" in marchstr:
+          if "rv32im" in marchstr:
               execute += ' -gRISCV_M=true'
           # 'privilege' tests also require C extension
-          if "c" in marchstr or "privilege" in test:
+          if "rv32ic" in marchstr or "privilege" in test:
               execute += ' -gRISCV_C=true'
-          if "b" in marchstr:
+          if "rv32izba" in marchstr or "rv32izbb" in marchstr or "rv32izbc" in marchstr or "rv32izbs" in marchstr:
               execute += ' -gRISCV_B=true'
-          if "u" in marchstr:
-              execute += ' -gRISCV_U=true'
           logger.debug('DUT executing ' + execute)
           utils.shellCommand(execute).run()