Move riscv-arch-tests to third-party

cartesi · Nov 25, 2022 · 47172ee · 47172ee
1 parent 0f489d9
commit 47172ee
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,14 +60,11 @@ jobs:
 
       - name: Build uarch-based interpreter
         run: |
-          eval $(make env)
-          make -C uarch
+          make uarch
 
-      # temporarily testing microarchitecture interpreter here
       - name: Test microarchitecture interpreter
         run: |
-          eval $(make env)
-          make -C riscv-arch-tests
+          make riscv-arch-tests
 
       - name: Upload emulator
         uses: actions/upload-artifact@master

diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ SRCDIR := $(abspath src)
 BUILDBASE := $(abspath build)
 BUILDDIR = $(BUILDBASE)/$(UNAME)_$(shell uname -m)
 DOWNLOADDIR := $(DEPDIR)/downloads
-SUBCLEAN := $(addsuffix .clean,$(SRCDIR))
+SUBCLEAN := $(addsuffix .clean,$(SRCDIR) uarch third-party/riscv-arch-tests)
 DEPDIRS := $(addprefix $(DEPDIR)/,cryptopp-CRYPTOPP_7_0_0 grpc)
 DEPCLEAN := $(addsuffix .clean,$(DEPDIRS))
 COREPROTO := lib/grpc-interfaces/core.proto
@@ -121,6 +121,8 @@ help:
 	@echo 'Generic targets:'
 	@echo '* all                        - build the src/ code. To build from a clean clone, run: make submodules downloads dep all'
 	@echo '  doc                        - build the doxygen documentation (requires doxygen to be installed)'
+	@echo '  uarch                      - build microarchitecture'
+	@echo '  riscv-arch-tests           - build and run microarchitecture rv64i instruction tests'
 
 $(DOWNLOADDIR):
 	@mkdir -p $(DOWNLOADDIR)
@@ -142,14 +144,15 @@ submodules:
 $(COREPROTO):
 	$(info gprc-interfaces submodule not initialized!)
 	@exit 1
-
 grpc: | $(COREPROTO)
 hash luacartesi grpc test lint coverage-report check-format format:
 	@eval $$($(MAKE) -s --no-print-directory env); $(MAKE) -C $(SRCDIR) $@
-
+riscv-arch-tests:
+	@eval $$($(MAKE) -s --no-print-directory env); $(MAKE) -C third-party/riscv-arch-tests
 source-default:
 	@eval $$($(MAKE) -s --no-print-directory env); $(MAKE) -C $(SRCDIR)
-
+uarch:
+	@eval $$($(MAKE) -s --no-print-directory env); $(MAKE) -C uarch
 $(DEPDIR)/cryptopp-CRYPTOPP_7_0_0 $(BUILDDIR)/lib/libcryptopp.$(LIB_EXTENSION): | $(BUILDDIR) $(DOWNLOADDIR)
 	if [ ! -d $(DEPDIR)/cryptopp-CRYPTOPP_7_0_0 ]; then tar -xzf $(DOWNLOADDIR)/CRYPTOPP_7_0_0.tar.gz -C $(DEPDIR); fi
 	$(MAKE) -C $(DEPDIR)/cryptopp-CRYPTOPP_7_0_0 shared
@@ -226,5 +229,5 @@ install: install-dep install-emulator install-strip $(INSTALL_PLAT)
 
 .SECONDARY: $(DOWNLOADDIR) $(DEPDIRS) $(COREPROTO)
 
-.PHONY: help all submodules doc clean distclean downloads src test luacartesi grpc hash\
+.PHONY: help all submodules doc clean distclean downloads src test luacartesi grpc hash uarch \
 	$(SUBDIRS) $(SUBCLEAN) $(DEPCLEAN)
diff --git a/riscv-arch-tests/.gitignore → third-party/riscv-arch-tests/.gitignore b/riscv-arch-tests/.gitignore → third-party/riscv-arch-tests/.gitignore
diff --git a/riscv-arch-tests/Makefile → third-party/riscv-arch-tests/Makefile b/riscv-arch-tests/Makefile → third-party/riscv-arch-tests/Makefile
@@ -1,5 +1,5 @@
-MACHINE_EMULATOR_DEFINES_DIR ?= $(abspath ../lib/machine-emulator-defines)
-EMULATOR_ROM ?= $(abspath ../../rom.bin)
+MACHINE_EMULATOR_DEFINES_DIR ?= $(abspath ../../lib/machine-emulator-defines)
+EMULATOR_ROM ?= $(abspath ../../../rom.bin)
 
 RISCV_ARCH_TEST_PROJ = riscv-arch-test
 RISCV_ARCHTEST_BASE_URL = https://github.com/riscv-non-isa/$(RISCV_ARCH_TEST_PROJ)/archive

diff --git a/riscv-arch-tests/README.md → third-party/riscv-arch-tests/README.md b/riscv-arch-tests/README.md → third-party/riscv-arch-tests/README.md
diff --git a/riscv-arch-tests/src/.gitignore → third-party/riscv-arch-tests/src/.gitignore b/riscv-arch-tests/src/.gitignore → third-party/riscv-arch-tests/src/.gitignore
diff --git a/riscv-arch-tests/src/Makefile → third-party/riscv-arch-tests/src/Makefile b/riscv-arch-tests/src/Makefile → third-party/riscv-arch-tests/src/Makefile
diff --git a/riscv-arch-tests/src/bootstrap.S → third-party/riscv-arch-tests/src/bootstrap.S b/riscv-arch-tests/src/bootstrap.S → third-party/riscv-arch-tests/src/bootstrap.S
diff --git a/riscv-arch-tests/src/bootstrap.ld.in → ...arty/riscv-arch-tests/src/bootstrap.ld.in b/riscv-arch-tests/src/bootstrap.ld.in → ...arty/riscv-arch-tests/src/bootstrap.ld.in
diff --git a/riscv-arch-tests/src/riscv-target/README.md → ...scv-arch-tests/src/riscv-target/README.md b/riscv-arch-tests/src/riscv-target/README.md → ...scv-arch-tests/src/riscv-target/README.md
diff --git a/...-tests/src/riscv-target/cartesi/README.md → ...-tests/src/riscv-target/cartesi/README.md b/...-tests/src/riscv-target/cartesi/README.md → ...-tests/src/riscv-target/cartesi/README.md
diff --git a/...cartesi/device/rv64i_m/I/Makefile.include → ...cartesi/device/rv64i_m/I/Makefile.include b/...cartesi/device/rv64i_m/I/Makefile.include → ...cartesi/device/rv64i_m/I/Makefile.include
diff --git a/...tests/src/riscv-target/cartesi/link.ld.in → ...tests/src/riscv-target/cartesi/link.ld.in b/...tests/src/riscv-target/cartesi/link.ld.in → ...tests/src/riscv-target/cartesi/link.ld.in
diff --git a/...sts/src/riscv-target/cartesi/model_test.h → ...sts/src/riscv-target/cartesi/model_test.h b/...sts/src/riscv-target/cartesi/model_test.h → ...sts/src/riscv-target/cartesi/model_test.h
diff --git a/riscv-arch-tests/src/run-rv64i-arch-test.lua → ...cv-arch-tests/src/run-rv64i-arch-test.lua b/riscv-arch-tests/src/run-rv64i-arch-test.lua → ...cv-arch-tests/src/run-rv64i-arch-test.lua