Skip to content

Commit 8869796

Browse files
[makefile] Update makefile to run the seperate tests for single lane
1 parent 588578e commit 8869796

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

apps/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,11 @@ riscv_tests: $(CVA6_BINARIES) $(ARA_BINARIES)
109109
define rvtest_compile_template
110110
TESTS_$(1) := $(addprefix bin/, $($(addsuffix _ara_tests, $1)))
111111

112+
ifeq ($(nr_lanes), 1)
113+
bin/$(1)-ara-%: $(TESTS_DIR)/$(1)/1_lane_tests/%.$(2) $(RUNTIME_GCC) linker_script
114+
else
112115
bin/$(1)-ara-%: $(TESTS_DIR)/$(1)/%.$(2) $(RUNTIME_GCC) linker_script
116+
endif
113117
mkdir -p bin/
114118
$$(RISCV_CC_GCC) -Iinclude -I$$(TESTS_DIR)/macros/scalar -I$$(TESTS_DIR)/macros/vector $$(RISCV_CCFLAGS_GCC) $$(RISCV_LDFLAGS_GCC) -o $$@ $$< $(RUNTIME_GCC) -T$$(CURDIR)/common/link.ld
115119
$$(RISCV_OBJDUMP) $$(RISCV_OBJDUMP_FLAGS) -D $$@ > $$@.dump
@@ -119,7 +123,11 @@ endef
119123
define rvtest_compile_template_c
120124
TESTS_$(1) := $(addprefix bin/, $($(addsuffix _ara_tests, $1)))
121125

126+
ifeq ($(nr_lanes), 1)
127+
bin/$(1)-ara-%: $(TESTS_DIR)/$(1)/1_lane_tests/%.$(2) $(RUNTIME_LLVM) linker_script
128+
else
122129
bin/$(1)-ara-%: $(TESTS_DIR)/$(1)/%.$(2) $(RUNTIME_LLVM) linker_script
130+
endif
123131
mkdir -p bin/
124132
$$(RISCV_CC) -Iinclude -I$$(TESTS_DIR)/macros/scalar -I$$(TESTS_DIR)/macros/vector $$(RISCV_CCFLAGS) $$(RISCV_LDFLAGS) -o $$@ $$< $(RUNTIME_LLVM) -T$$(CURDIR)/common/link.ld
125133
$$(RISCV_OBJDUMP) $$(RISCV_OBJDUMP_FLAGS) -D $$@ > $$@.dump

apps/common/riscv_tests.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ include $(TESTS_DIR)/rv64um/Makefrag
88
include $(TESTS_DIR)/rv64ua/Makefrag
99
include $(TESTS_DIR)/rv64uf/Makefrag
1010
include $(TESTS_DIR)/rv64ud/Makefrag
11-
include $(TESTS_DIR)/rv64uv/Makefrag
11+
ifeq ($(nr_lanes), 1)
12+
include $(TESTS_DIR)/rv64uv/1_lane_tests/Makefrag
13+
else
14+
include $(TESTS_DIR)/rv64uv/Makefrag
15+
endif
1216
include $(TESTS_DIR)/rv64si/Makefrag
1317

1418
rv64ui_ara_tests := $(addprefix rv64ui-ara-, $(rv64ui_sc_tests))

0 commit comments

Comments
 (0)