update

Signed-off-by: Abdul Wadood <abdulwadood.afzal88@gmail.com>
Abdulwadoodd · Feb 20, 2024 · f5d5234 · f5d5234
1 parent 24ff54c
commit f5d5234
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 29 deletions.
diff --git a/.github/workflows/arch-test.yml b/.github/workflows/arch-test.yml
@@ -25,31 +25,18 @@ jobs:
             tar -xzf riscv64-elf-ubuntu-22.04-gcc-nightly-2023.12.20-nightly.tar.gz
             echo $GITHUB_WORKSPACE/riscv/bin >> $GITHUB_PATH
         
-        - name: Run RV32E
-          run: |
-            ls riscv/bin
-            cat $GITHUB_PATH
-            cd ci-tests/riscof
-            riscof arch-test --clone
-            sed -i 's/\(ispec=\)\(.*\)/\1spike\/spike_isa32e.yaml/' config.ini
-            ./run-tests.sh rv32e_work
-
         - name: Build spike
           run: |
             ci-tests/build-spike
-            echo install/bin >> $GITHUB_PATH
+            echo $GITHUB_WORKSPACE/install/bin >> $GITHUB_PATH
         
         - name: Build Sail
           run: |
             ci-tests/build-sail
-            echo c_emulator >> $GITHUB_PATH
+            echo $GITHUB_WORKSPACE/c_emulator >> $GITHUB_PATH
         
         - name: Init arch-tests
           run: |
-            riscv_sim_RV64
-            riscv_sim_RV32
-            spike -h
-            riscv64-unknown-elf-objdump -v
             cd ci-tests/riscof
             riscof arch-test --clone
         

diff --git a/ci-tests/riscof/sail_cSim/riscof_sail_cSim.py b/ci-tests/riscof/sail_cSim/riscof_sail_cSim.py
@@ -65,20 +65,20 @@ def build(self, isa_yaml, platform_yaml):
             self.isa += 'f'
         if "D" in ispec["ISA"]:
             self.isa += 'd'
-        # objdump = "riscv64-unknown-elf-objdump"
-        # if shutil.which(objdump) is None:
-        #     logger.error(objdump+": executable not found. Please check environment setup.")
-        #     raise SystemExit(1)
-        # compiler = "riscv64-unknown-elf-gcc"
-        # if shutil.which(compiler) is None:
-        #     logger.error(compiler+": executable not found. Please check environment setup.")
-        #     raise SystemExit(1)
-        # if shutil.which(self.sail_exe[self.xlen]) is None:
-        #     logger.error(self.sail_exe[self.xlen]+ ": executable not found. Please check environment setup.")
-        #     raise SystemExit(1)
-        # if shutil.which(self.make) is None:
-        #     logger.error(self.make+": executable not found. Please check environment setup.")
-        #     raise SystemExit(1)
+        objdump = "riscv64-unknown-elf-objdump"
+        if shutil.which(objdump) is None:
+            logger.error(objdump+": executable not found. Please check environment setup.")
+            raise SystemExit(1)
+        compiler = "riscv64-unknown-elf-gcc"
+        if shutil.which(compiler) is None:
+            logger.error(compiler+": executable not found. Please check environment setup.")
+            raise SystemExit(1)
+        if shutil.which(self.sail_exe[self.xlen]) is None:
+            logger.error(self.sail_exe[self.xlen]+ ": executable not found. Please check environment setup.")
+            raise SystemExit(1)
+        if shutil.which(self.make) is None:
+            logger.error(self.make+": executable not found. Please check environment setup.")
+            raise SystemExit(1)
 
     def runTests(self, testList, cgf_file=None):
         if os.path.exists(self.work_dir+ "/Makefile." + self.name[:-1]):