Configure sail to disable compressed instructions and use norelax

Author: object-Object

riscof/Makefile

@@ -4,6 +4,9 @@ run:
 run-dut:
 	riscof run --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env --no-ref-run
 
+run-ref:
+	riscof run --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env --no-dut-run
+
 validate:
 	riscof validateyaml --config=config.ini
 

riscof/sail_cSim/env/model_test.h

@@ -18,7 +18,8 @@
     sw x1, tohost, t5;                                                        \
     j write_tohost;
 
-#define RVMODEL_BOOT
+#define RVMODEL_BOOT \
+  .option norelax;
 
 //RV_COMPLIANCE_DATA_BEGIN
 #define RVMODEL_DATA_BEGIN                                              \

riscof/sail_cSim/riscof_sail_cSim.py

@@ -101,7 +101,7 @@ def runTests(self, testList, cgf_file=None, header_file= None):
             execute += self.objdump_cmd.format(elf, self.xlen, 'ref.disass')
             sig_file = os.path.join(test_dir, self.name[:-1] + ".signature")
 
-            execute += self.sail_exe[self.xlen] + ' --test-signature={0} {1} > {2}.log 2>&1;'.format(sig_file, elf, test_name)
+            execute += self.sail_exe[self.xlen] + ' --disable-compressed --test-signature={0} {1} > {2}.log 2>&1;'.format(sig_file, elf, test_name)
 
             cov_str = ' '
             for label in testentry['coverage_labels']: