ci: try to fix qemu run ci in gitlab

Signed-off-by: Huaqi Fang <[email protected]>

Author: fanghuaqi

.github/workflows/build.yml

@@ -98,6 +98,9 @@ jobs:
           fi
           echo "which $qemucmd" > $SHOWQEMUSH
           echo "$qemucmd --version" >> $SHOWQEMUSH
+          if [[ $CORE == *fd* ]] ; then
+              ARCH_EXT=v
+          fi
           echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=${ARCH_EXT}_svpbmt_zicbom_sstc,h=true -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
           chmod +x $RUNQEMUSH
           chmod +x $SHOWQEMUSH

.gitlab-ci.yml

@@ -415,7 +415,7 @@ build_ux900fd_flash:
     variables:
         SOC: "evalsoc"
         CORE: "ux900fd"
-        ARCH_EXT: ""
+        ARCH_EXT: "v"
         BOOT_MODE: "flash"
     parallel:
         matrix:
@@ -430,7 +430,7 @@ build_ux900fd_sd:
     variables:
         SOC: "evalsoc"
         CORE: "ux900fd"
-        ARCH_EXT: ""
+        ARCH_EXT: "v"
         BOOT_MODE: "sd"
     parallel:
         matrix:
@@ -445,7 +445,7 @@ build_ux900fd_sd_manual:
     variables:
         SOC: "evalsoc"
         CORE: "ux900fd"
-        ARCH_EXT: ""
+        ARCH_EXT: "v"
         BOOT_MODE: "sd"
     <<: *build_linux_sdk_manual_job_def
 
@@ -457,7 +457,7 @@ build_ux900fd_flash_manual:
     variables:
         SOC: "evalsoc"
         CORE: "ux900fd"
-        ARCH_EXT: ""
+        ARCH_EXT: "v"
         BOOT_MODE: "flash"
     <<: *build_linux_sdk_manual_job_def
 

Makefile

@@ -546,7 +546,8 @@ opensbi_sim: $(opensbi_payload)
 
 # Deprecated, internal usage for xlspike
 sim: $(opensbi_payload)
-	$(xlspike) --isa=$(ISA) $(opensbi_payload)
+	# ERROR: bad --isa option 'rv64imafdcv_svpbmt_zicbom_sstc'. unsupported extension: sstc
+	$(xlspike) --isa=$(ISA)$(ARCH_EXT)_svpbmt_zicbom $(opensbi_payload)
 
 .PHONY: gendisk run_qemu