Skip to content

fix(spec2006): honor default DTB setting #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
poemonsense merged 1 commit into from
May 8, 2026
Merged

fix(spec2006): honor default DTB setting #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions workloads/linux/spec2006/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SPEC2006_CROSS_COMPILE ?= riscv64-unknown-linux-gnu-
SPEC2006_COMPILER_ROOT ?=
SPEC2006_GNU_TOOLCHAIN_ROOT ?=
SPEC2006_JEMALLOC_ROOT ?=
SPEC2006_DEFAULT_DTB ?= xiangshan-fpga-noAIA
SPEC2006_DEFAULT_DTB ?= $(if $(DEFAULT_DTB),$(DEFAULT_DTB),xiangshan-fpga-noAIA)
SPEC2006_TUNE ?= base
SPEC2006_JOBS ?= $(shell nproc)
SPEC2006_INPUT ?= ref
Expand All @@ -36,6 +36,7 @@ SPEC2006_SELECTED_CASES := $(shell python3 $(SPEC2006_HELPER) --cases-config $(S
SPEC2006_IMAGE_CASES := $(SPEC2006_SELECTED_CASES)
SPEC2006_ELF_TARGETS := $(foreach case,$(SPEC2006_SELECTED_CASES),$(SPEC2006_BUILD_DIR)/$(case)/elf/$(case).elf)
SPEC2006_DTS_SOURCES := $(shell find $(SPEC2006_DTS_DIR) -type f 2>/dev/null)
SPEC2006_DEFAULT_DTB_STAMP := $(SPEC2006_BUILD_DIR)/dtb.$(shell printf '%s\n' "$(SPEC2006_DEFAULT_DTB)" | sha256sum | cut -d ' ' -f 1)

WORKLOAD_DIRS += $(SPEC2006_BUILD_DIR)

Expand Down Expand Up @@ -67,6 +68,11 @@ spec2006-check-spec-dir:
*) echo "SPEC2006_INPUT must be one of: ref, train, test, all"; exit 1 ;; \
esac

$(SPEC2006_DEFAULT_DTB_STAMP):
@mkdir -p "$(@D)"
@rm -f "$(SPEC2006_BUILD_DIR)"/dtb.*
@touch "$@"

define add_spec2006_case
$(SPEC2006_BUILD_DIR)/$(1)/download/sentinel:
@mkdir -p $$(@D)
Expand Down Expand Up @@ -107,7 +113,7 @@ $(SPEC2006_BUILD_DIR)/$(1)/rootfs.cpio: spec2006-check-spec-dir $$(SPEC2006_HELP
SPEC2006_JOBS="$$(SPEC2006_JOBS)" \
bash "$$(SPEC2006_SCRIPTS_DIR)/build-workload-linux.sh" "$$(SPEC2006_WORKLOAD_DIR)" "$(SPEC2006_BUILD_DIR)/$(1)"

$(SPEC2006_BUILD_DIR)/$(1)/fw_payload.bin: $$(SPEC2006_DTS_SOURCES) $$(SPEC2006_GCPT_BIN) $$(SPEC2006_SCRIPTS_DIR)/build-firmware-linux.sh $(SPEC2006_BUILD_DIR)/$(1)/rootfs.cpio $$(SPEC2006_LINUX_IMAGE) $$(SPEC2006_SBI_BIN)
$(SPEC2006_BUILD_DIR)/$(1)/fw_payload.bin: $$(SPEC2006_DTS_SOURCES) $$(SPEC2006_DEFAULT_DTB_STAMP) $$(SPEC2006_GCPT_BIN) $$(SPEC2006_SCRIPTS_DIR)/build-firmware-linux.sh $(SPEC2006_BUILD_DIR)/$(1)/rootfs.cpio $$(SPEC2006_LINUX_IMAGE) $$(SPEC2006_SBI_BIN)
@printf '$(SPEC2006_PROGRESS_PREFIX) Assembling firmware for $(1)\n'
@CROSS_COMPILE="$$(SPEC2006_BUILDROOT_CROSS_COMPILE)" \
DTC="$$(SPEC2006_DTC)" \
Expand Down
Loading