From d525cc25d8cda1239802b0c5ebca477462cdc8e1 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 11 Dec 2024 13:57:51 -0800
Subject: [PATCH] Cleanup

---
 sim/questa/wally.do    |  4 +---
 testbench/testbench.sv |  1 -
 tests/breker/Makefile  | 35 +++++++++++++----------------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 9647e1946..f3977e167 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -37,7 +37,6 @@ onerror {quit -f}
 # Initialize variables
 set CFG ${1}
 set TESTSUITE ${2}
-set TESTSUITE_NO_ELF [file rootname ${TESTSUITE}]
 set TESTBENCH ${3}
 set WKDIR wkdir/${CFG}_${TESTSUITE}
 set WALLY $::env(WALLY)
@@ -67,7 +66,6 @@ set FCvlog ""
 set breker 0
 set brekervlog ""
 set brekervopt ""
-set brekervsim ""
 
 set lockstep 0
 set lockstepvlog ""
@@ -188,7 +186,7 @@ vlog -permissive -lint -work ${WKDIR} {*}${INC_DIRS} {*}${DefineArgs} {*}${FCvlo
 # remove +acc flag for faster sim during regressions if there is no need to access internal signals
 vopt $accFlag ${WKDIR}.${TESTBENCH} ${brekervopt} -work ${WKDIR} {*}${ExpandedParamArgs} -o testbenchopt ${CoverageVoptArg}
 
-vsim -lib ${WKDIR} testbenchopt +TEST=${TESTSUITE} {*}${PlusArgs} -fatal 7 {*}${SVLib} {*}${brekervsim} -suppress 3829 ${CoverageVsimArg}
+vsim -lib ${WKDIR} testbenchopt +TEST=${TESTSUITE} {*}${PlusArgs} -fatal 7 {*}${SVLib} -suppress 3829 ${CoverageVsimArg}
 
 # power add generates the logging necessary for saif generation.
 # power add -r /dut/core/*
diff --git a/testbench/testbench.sv b/testbench/testbench.sv
index 43a01e5c8..3acd42f1e 100644
--- a/testbench/testbench.sv
+++ b/testbench/testbench.sv
@@ -700,7 +700,6 @@ module testbench;
   always @(posedge clk) begin
   //  if (reset) PrevPCZero <= 0;
   //  else if (dut.core.InstrValidM) PrevPCZero <= (FunctionName.PCM == 0 & dut.core.ifu.InstrM == 0);
-    // $display("PCE: %0h IEUAdrM: %0h Label (tohost): %0h instruction: %s", dut.core.ifu.PCE, dut.core.lsu.IEUAdrM, ProgramAddrLabelArray["tohost"], InstrMName);
     TestComplete <= ((InstrM == 32'h6f) & dut.core.InstrValidM ) |
 		   ((dut.core.lsu.IEUAdrM == ProgramAddrLabelArray["tohost"] & dut.core.lsu.IEUAdrM != 0) & InstrMName == "SW"); // |
     //   (FunctionName.PCM == 0 & dut.core.ifu.InstrM == 0 & dut.core.InstrValidM & PrevPCZero));
diff --git a/tests/breker/Makefile b/tests/breker/Makefile
index 77002dfb1..6fe052277 100644
--- a/tests/breker/Makefile
+++ b/tests/breker/Makefile
@@ -9,21 +9,17 @@ CUSTOMER_YAML    := $(TREKFILES)/customer.yaml
 TREKSVIP_YAML    := $(BREKER_HOME)/examples/tutorials/svip/treksvip/yaml/treksvip.yaml
 CONSTRAINT_FILES := $(shell find $(CONSTRAINTS_DIR) -type f)
 TREKEXE_FLAGS    += --seed 0x # free (0x) or lock (0x1) the seed used for test generation
-TREKSVIP = source $(TREKFILES)/breker-setup.sh && treksvip -p $(PLATFORM_YAML) -p $(TREKSVIP_YAML) $(TREKEXE_FLAGS)
-
-EXAMPLES_LIB = $(WALLY)/examples/C/common
-
-# -nostdlib -static -lm -fno-tree-loop-distribute-patterns
+TREKSVIP         := source $(TREKFILES)/breker-setup.sh && treksvip -p $(PLATFORM_YAML) -p $(TREKSVIP_YAML) $(TREKEXE_FLAGS)
 
 # Compilation paths and variables
-MARCH        :=-march=rv64gc_zcb_zfa_zba_zbb_zbc_zbs_zfh_zicboz_zicbop_zicbom_zbkb_zbkx_zknd_zkne_zknh_svinval 
-MABI         :=-mabi=lp64d
-LINKER       := $(EXAMPLES_LIB)/test.ld
-# $(WALLY)/tests/custom/linker8000-0000.x
-LINK_FLAGS   := -nostartfiles
-CFLAGS 		   := -Wa,-alhs -Wa,-L -mcmodel=medany -Og -DSINGLE_CPU 
-CRT0_DIR     := $(WALLY)/tests/custom/crt0
-WIDTH        := 64
+START_LIB_DIR := $(WALLY)/examples/C/common
+START_LIB     := $(START_LIB_DIR)/crt.S $(START_LIB_DIR)/syscalls.c
+MARCH         :=-march=rv64gc_zcb_zfa_zba_zbb_zbc_zbs_zfh_zicboz_zicbop_zicbom_zbkb_zbkx_zknd_zkne_zknh_svinval 
+MABI          :=-mabi=lp64d
+LINKER        := $(START_LIB_DIR)/test.ld
+LINK_FLAGS    := -nostartfiles
+CFLAGS 		    := -Wa,-alhs -Wa,-L -mcmodel=medany -Og -DSINGLE_CPU 
+WIDTH         := 64
 
 # Find all constraint files and generate tests for each one
 TESTS = $(patsubst $(CONSTRAINTS_DIR)/%.yaml,$(TESTDIR)/%,$(CONSTRAINT_FILES))
@@ -37,9 +33,8 @@ $(TESTDIR)/%: $(CONSTRAINTS_DIR)/%.yaml | $(TESTDIR)
 
 # Compile c code
 .PRECIOUS: %.elf
-%.elf: %.c $(CRT0_DIR)/libcrt0.a
-	riscv64-unknown-elf-gcc $(MARCH) $(MABI) $(CFLAGS) $(LINK_FLAGS) -g -o $@ $< -T $(LINKER) -I$(EXAMPLES_LIB) $(EXAMPLES_LIB)/crt.S $(EXAMPLES_LIB)/syscalls.c> /dev/null
-# riscv64-unknown-elf-gcc $(MARCH) $(MABI) $(CFLAGS) $(LINK_FLAGS) -g -o $@ $< -L$(CRT0_DIR) -lcrt0 -T $(LINKER) > /dev/null
+%.elf: %.c 
+	riscv64-unknown-elf-gcc $(MARCH) $(MABI) $(CFLAGS) $(LINK_FLAGS) -T$(LINKER) -I$(START_LIB_DIR) $(START_LIB) -g -o $@ $< > /dev/null
 
 # Convert elf to hex
 %.elf.memfile: %.elf
@@ -48,12 +43,8 @@ $(TESTDIR)/%: $(CONSTRAINTS_DIR)/%.yaml | $(TESTDIR)
 	extractFunctionRadix.sh $<.objdump
 
 # View the model graph TODO: What does this do? Move to another makefile?
-%.view_graph:%
-	$(TREKSVIP) -p ../tests/test_$^.yaml -p $(CUSTOMER_YAML) -t pss_top.entry
-
-# Library needed for C code
-$(CRT0_DIR)/libcrt0.a:
-	make -C $(CRT0_DIR)
+%.view_graph: $(CONSTRAINTS_DIR)/%.yaml
+	$(TREKSVIP) -p $(CONSTRAINTS_DIR)/$^.yaml -p $(CUSTOMER_YAML) -t pss_top.entry
 
 $(TESTDIR):
 	mkdir -p $(TESTDIR)