From fcbbb3d19897de7c230c02c4dfb7eec706f3a509 Mon Sep 17 00:00:00 2001 From: Kevin Kim Date: Tue, 30 Nov 2021 23:02:02 -0800 Subject: [PATCH] Makefile up and running --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 670409b39..07b4ca359 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,22 @@ make all: submodules other submodules: addins/riscv-isa-sim addins/riscv-arch-test - cd addins;git init; git submodule add https://github.com/riscv-non-isa/riscv-arch-test; git submodule add https://github.com/riscv-software-src/riscv-isa-sim - git submodule update --init --recursive + git pull --recurse-submodules other: cp -r addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/I addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/F - cp -r addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/I addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/D + cp -r addins/riscv-isa-sim/arch_test_target/spike/device/rv64i_m/I addins/riscv-isa-sim/arch_test_target/spike/device/rv64i_m/D + cat addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/F/Makefile.include sed -i 's/--isa=rv32i /--isa=32if/' addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/F/Makefile.include - sed -i 's/--isa=rv32i /--isa=32if/' addins/riscv-isa-sim/arch_test_target/spike/device/rv32i_m/D/Makefile.include -ifneq ("$(wildcard $(addins/riscv-isa-sim/build/.*))",) -else - mkdir addins/riscv-isa-sim/build -endif + sed -i 's/--isa=rv64i /--isa=64if/' addins/riscv-isa-sim/arch_test_target/spike/device/rv64i_m/D/Makefile.include + if [ -d "addins/riscv-isa-sim/build" ]; then echo "Build exists"; else mkdir addins/riscv-isa-sim/build; fi cd addins/riscv-isa-sim/build; ../configure --prefix=/cad/riscv/gcc/bin - make -C addins/riscv-isa-sim/ + make -C addins/riscv-isa-sim/build + sudo make install -C addins/riscv-isa-sim/build + cp addins/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/ sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= /home/harris/riscv-wally/addins/riscv-isa-sim/arch_test_target' tests/wally-riscv-arch-test/Makefile.include echo export RISCV_PREFIX = riscv64-unknown-elf- >> tests/wally-riscv-arch-test/Makefile.include - make -C tests/wally-riscv-arch-test - make -C tests/wally-riscv-arch-test XLEN=32 + make -C addins/riscv-arch-test + make -C addins/riscv-arch-test XLEN=32 cd tests/wally-riscv-arch-test; exe2memfile.pl work/*/*/*.elf make -C wally-pipelined/regression