From 422e7fd4e6aadba94016be3a0b8f3fa0156ac2cd Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Tue, 26 May 2020 13:36:13 -0700 Subject: [PATCH] Bump hammer for last pre-merge fixes, update make target names --- vlsi/Makefile | 1 + vlsi/hammer | 2 +- vlsi/hammer-cadence-plugins | 2 +- vlsi/hammer-synopsys-plugins | 2 +- vlsi/power.mk | 8 ++++---- vlsi/sim.mk | 16 ++++++++-------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/vlsi/Makefile b/vlsi/Makefile index 4c637fdb..cd2d3d91 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -179,6 +179,7 @@ ifeq ($(CUSTOM_VLOG), ) GENERATED_CONFS += $(if $(filter $(tech_name), asap7), , $(SRAM_CONF)) endif +#TODO: remove filter-out once PR#572 is merged $(SYN_CONF): $(VLSI_RTL) $(VLSI_BB) mkdir -p $(dir $@) echo "sim.inputs:" > $@ diff --git a/vlsi/hammer b/vlsi/hammer index d5b522ad..c917e938 160000 --- a/vlsi/hammer +++ b/vlsi/hammer @@ -1 +1 @@ -Subproject commit d5b522ad1aace2a534c677bdca7b16f473efe217 +Subproject commit c917e9386f1005bd5307bd45acd58f4a5fe27aab diff --git a/vlsi/hammer-cadence-plugins b/vlsi/hammer-cadence-plugins index cf2304c2..427e5ca3 160000 --- a/vlsi/hammer-cadence-plugins +++ b/vlsi/hammer-cadence-plugins @@ -1 +1 @@ -Subproject commit cf2304c21166cea140cc8e039824feeb51c89e0d +Subproject commit 427e5ca3057dd56ab2282a1ec5e45e912dffd7fb diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins index 451e0721..b76ed57f 160000 --- a/vlsi/hammer-synopsys-plugins +++ b/vlsi/hammer-synopsys-plugins @@ -1 +1 @@ -Subproject commit 451e072193f13f4a25cfa891426a52dbd7556c03 +Subproject commit b76ed57f2ab2fa43dfe58d0f5c9a4d4748bf59c1 diff --git a/vlsi/power.mk b/vlsi/power.mk index f394ced7..d1c56e2c 100644 --- a/vlsi/power.mk +++ b/vlsi/power.mk @@ -1,6 +1,6 @@ .PHONY: $(POWER_CONF) -power: $(POWER_CONF) sim-par -power: override HAMMER_POWER_EXTRA_ARGS += -p $(POWER_CONF) -redo-power: $(POWER_CONF) -redo-power: override HAMMER_EXTRA_ARGS += -p $(POWER_CONF) +power-par: $(POWER_CONF) sim-par +power-par: override HAMMER_POWER_EXTRA_ARGS += -p $(POWER_CONF) +redo-power-par: $(POWER_CONF) +redo-power-par: override HAMMER_EXTRA_ARGS += -p $(POWER_CONF) $(OBJ_DIR)/power-rundir/power-output-full.json: private override HAMMER_EXTRA_ARGS += $(HAMMER_POWER_EXTRA_ARGS) diff --git a/vlsi/sim.mk b/vlsi/sim.mk index 71b05ae7..6abd7995 100644 --- a/vlsi/sim.mk +++ b/vlsi/sim.mk @@ -1,9 +1,9 @@ .PHONY: $(SIM_CONF) $(SIM_DEBUG_CONF) $(SIM_TIMING_CONF) # Update hammer top-level sim targets to include our generated sim configs -redo-sim: $(SIM_CONF) -redo-sim: override HAMMER_EXTRA_ARGS += -p $(SIM_CONF) -redo-sim-debug: $(SIM_DEBUG_CONF) redo-sim -redo-sim-debug: override HAMMER_EXTRA_ARGS += -p $(SIM_DEBUG_CONF) +redo-sim-rtl: $(SIM_CONF) +redo-sim-rtl: override HAMMER_EXTRA_ARGS += -p $(SIM_CONF) +redo-sim-rtl-debug: $(SIM_DEBUG_CONF) redo-sim-rtl +redo-sim-rtl-debug: override HAMMER_EXTRA_ARGS += -p $(SIM_DEBUG_CONF) redo-sim-syn: $(SIM_CONF) redo-sim-syn: override HAMMER_EXTRA_ARGS += -p $(SIM_CONF) @@ -17,10 +17,10 @@ redo-sim-par-debug: override HAMMER_EXTRA_ARGS += -p $(SIM_DEBUG_CONF) redo-sim-par-timing-debug: $(SIM_TIMING_CONF) redo-sim-par-debug redo-sim-par-timing-debug: override HAMMER_EXTRA_ARGS += -p $(SIM_TIMING_CONF) -sim: $(SIM_CONF) -sim: override HAMMER_SIM_EXTRA_ARGS += -p $(SIM_CONF) -sim-debug: $(SIM_DEBUG_CONF) sim -sim-debug: override HAMMER_SIM_EXTRA_ARGS += -p $(SIM_DEBUG_CONF) +sim-rtl: $(SIM_CONF) +sim-rtl: override HAMMER_SIM_EXTRA_ARGS += -p $(SIM_CONF) +sim-rtl-debug: $(SIM_DEBUG_CONF) sim-rtl +sim-rtl-debug: override HAMMER_SIM_EXTRA_ARGS += -p $(SIM_DEBUG_CONF) $(OBJ_DIR)/sim-rundir/sim-output-full.json: private override HAMMER_EXTRA_ARGS += $(HAMMER_SIM_EXTRA_ARGS) sim-syn: $(SIM_CONF)