From 0580932cb0da7fac6b8aa5f5b98beb824a3fff50 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Tue, 22 Mar 2022 16:42:04 +0000
Subject: Fix Makefiles in build and for benchmarks

---
 benchmarks/polybench-syn/common.mk         | 8 +++++---
 benchmarks/polybench-syn/stencils/Makefile | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'benchmarks/polybench-syn')

diff --git a/benchmarks/polybench-syn/common.mk b/benchmarks/polybench-syn/common.mk
index 8e67294..0ebc527 100644
--- a/benchmarks/polybench-syn/common.mk
+++ b/benchmarks/polybench-syn/common.mk
@@ -1,15 +1,16 @@
 VERICERT ?= vericert
-VERICERT_OPTS ?= -DSYNTHESIS -fschedule -fif-conv
+VERICERT_OPTS ?= -DSYNTHESIS -fschedule
 
 IVERILOG ?= iverilog
 IVERILOG_OPTS ?=
 
 VERILATOR ?= verilator
-VERILATOR_OPTS ?= -Wno-fatal --top main --exe /home/ymherklotz/projects/vericert/scripts/verilator_main.cpp
+VERILATOR_OPTS ?= -Wno-fatal -Wno-lint -Wno-style -Wno-WIDTH --top main --exe /home/ymherklotz/projects/vericert/scripts/verilator_main.cpp
 
 TARGETS ?=
 
 %.v: %.c
+	@echo -e "\033[0;35mMAKE\033[0m" $<
 	$(VERICERT) $(VERICERT_OPTS) $< -o $@
 
 %.iver: %.v
@@ -20,7 +21,8 @@ TARGETS ?=
 
 %.verilator: %.v
 	$(VERILATOR) $(VERILATOR_OPTS) --Mdir $@ --cc $<
-	$(MAKE) -C $@ -f Vmain.mk
+	@echo -e $(MAKE) -C $@ -f Vmain.mk
+	@$(MAKE) -C $@ -f Vmain.mk &>/dev/null
 
 %: %.iver %.gcc %.verilator
 	cp $< $@
diff --git a/benchmarks/polybench-syn/stencils/Makefile b/benchmarks/polybench-syn/stencils/Makefile
index d2e1c9b..9b89b0c 100644
--- a/benchmarks/polybench-syn/stencils/Makefile
+++ b/benchmarks/polybench-syn/stencils/Makefile
@@ -3,4 +3,5 @@ TARGETS := adi fdtd-2d heat-3d jacobi-1d jacobi-2d seidel-2d
 include ../common.mk
 
 adi.v: adi.c
+	@echo -e "\033[0;35mMAKE\033[0m" $<
 	$(VERICERT) $(VERICERT_OPTS) -O0 -finline $< -o $@
-- 
cgit