From 2ee9cc66b9961327b17adbaa1a78b7b655e4392f Mon Sep 17 00:00:00 2001
From: supersurviveur <julien.thillard38@gmail.com>
Date: Thu, 6 Nov 2025 17:23:09 +0100
Subject: [PATCH] Refactor tests

---
 Makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d8ee3f9..8585b46 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ BENCH_DIR := bench
 MEM_DIR := $(BENCH_DIR)/mem
 SRC_SW := $(shell find $(BENCH_DIR) -name '*.s' -type f | sed 's/^bench\///g') 
 SRC_SW += $(wildcard $(BENCH_DIR)/*.c) # Contient tous les .s et .c du projet
-SRC_TESTS_SW := $(shell find $(BENCH_DIR)/tests -name '*.s' -type f | sed 's/^bench\///g') 
+SRC_TESTS_SW := $(shell find $(BENCH_DIR)/tests -name '*.s' -type f | sed 's/^bench\///g')
 MEM = $(addprefix $(MEM_DIR)/, $(addsuffix .mem, $(basename $(SRC_SW)))) # Tous les .mem du projet
-MEM_TESTS = $(addprefix $(MEM_DIR)/, $(addsuffix .mem, $(basename $(SRC_TESTS_SW)))) # Tous les .mem du projet
+MEM_TESTS = $(addprefix test-, $(addprefix $(MEM_DIR)/, $(addsuffix .mem, $(basename $(SRC_TESTS_SW))))) # Tous les .mem du projet en test
 PREFIX  := $(shell command -v riscv64-unknown-elf-gcc >/dev/null 2>&1 && echo riscv64-unknown-elf- || echo /matieres/3MMFMN/riscv32/bin/riscv32-unknown-elf-)
 CC      := $(PREFIX)gcc
 OBJDUMP := $(PREFIX)objdump
@@ -56,8 +56,7 @@ ODFLAGS       :=-j .text -j .rodata -j .data -s
 
 .PRECIOUS: $(MEM_DIR)/%.elf
 
-.PHONY: synthese fpga clean compile autotest simulation force
-force:
+.PHONY: synthese fpga clean compile autotest simulation
 	
 compile: $(MEM)
 $(MEM_DIR):
@@ -73,9 +72,8 @@ $(MEM_DIR)/%.elf: $(BENCH_DIR)/%.s |$(MEM_DIR)
 $(MEM_DIR)/%.mem: $(MEM_DIR)/%.elf |$(MEM_DIR) 
 	$(OBJDUMP) $(ODFLAGS) $< | awk -f $(OBTOMEM) | awk -f common/fix_mem.awk > $@
 
-$(MEM_DIR)/tests/%.mem: $(MEM_DIR)/tests/%.elf force |$(MEM_DIR) 
-	$(OBJDUMP) $(ODFLAGS) $< | awk -f $(OBTOMEM) | awk -f common/fix_mem.awk > $@
-	@PROG="$(shell echo $@ | sed "s/^bench\/mem\///g" | sed "s/\.mem$$//g")" PROOT=$(shell pwd) ./mill TPchisel.test.testOnly $(TOP_REP).$(TOP_TEST) -- -z "$(shell echo $@ | sed "s/^bench\/mem\///g" | sed "s/\.mem$$//g")"
+test-$(MEM_DIR)/%.mem: $(MEM_DIR)/%.mem |$(MEM_DIR) 
+	@PROG="$(shell echo $< | sed "s/^bench\/mem\///g" | sed "s/\.mem$$//g")" PROOT=$(shell pwd) ./mill TPchisel.test.testOnly $(TOP_REP).$(TOP_TEST) -- -z "$(shell echo $< | sed "s/^bench\/mem\///g" | sed "s/\.mem$$//g")"
 
 
 ###############################################################################
@@ -98,7 +96,7 @@ mill:
 	@curl -L https://raw.githubusercontent.com/lefou/millw/0.4.11/millw > mill 
 	@chmod +x mill
 
-autotest: mill bench/mem/tests/$(PROG).mem ##! Lance la simulation automatique pour tous les tests ou juste celui fourni dans PROG
+autotest: mill test-bench/mem/tests/$(PROG).mem ##! Lance la simulation automatique pour tous les tests ou juste celui fourni dans PROG
 
 testall: mill $(MEM_TESTS)