Remove generated bootdata.cc in repo (#38)

* Remove generated bootdata.cc * Update .gitignore * Update CI * Add dependency to bootdata.cc * Update CI * Update CI for multi-threading compilation
KULeuven-MICAS · Sep 15, 2024 · 6748c07 · 6748c07
1 parent 15d8d20
commit 6748c07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,19 +44,19 @@ jobs:
       - name: Compile Bootrom
         run: |
           echo "Compiling Bootrom"
-          make bootrom
+          make bootrom CFG_OVERRIDE=target/rtl/cfg/occamy_cfg/hemaia.hjson
       - name: Compile SW
         run: |
           echo "Compiling SW"
-          make sw CFG_OVERRIDE=target/sw/cfg/occamy_cfg/hemaia.hjson
+          make sw CFG_OVERRIDE=target/sw/cfg/occamy_cfg/hemaia.hjson -j$(nproc)
       - name: Compile RTL
         run: |
           make rtl CFG_OVERRIDE=target/rtl/cfg/occamy_cfg/hemaia.hjson
       - name: Compile Verilator Binary
         run: |
-          make occamy_system_vlt
+          make occamy_system_vlt -j$(nproc)
       - name: Run Tests
         working-directory: target/sim
-        run: |-
+        run: |
           ./run.py --simulator verilator \
           sw/sim_elf.yaml -j
diff --git a/target/rtl/test/.gitignore b/target/rtl/test/.gitignore
@@ -2,3 +2,4 @@ testharness.sv
 bootrom.bin
 bootrom.elf
 bootrom.dump
+bootdata.cc
diff --git a/target/rtl/test/bootdata.cc b/target/rtl/test/bootdata.cc
diff --git a/target/sim/Makefile b/target/sim/Makefile
@@ -192,7 +192,7 @@ bootrom: $(BOOTROM_TARGETS)
 clean-bootrom:
 	rm -rf $(BOOTROM_TARGETS)
 
-test/bootdata.cc:
+test/bootdata.cc: $(CFG)
 	@$(OCCAMYGEN) --cfg $(CFG) --bootdata test/bootdata.cc.tpl -o test/
 test/bootrom.elf: test/bootrom.S test/bootrom.ld
 	$(CVA6_GCC_CC) $(CVA6_GCC_BOOTROM_CFLAGS) $(CVA6_GCC_BOOTROM_LDFLAGS) $< -o test/bootrom.elf