wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump hammer for last pre-merge fixes, update make target names

Browse Source
This commit is contained in:
Colin Schmidt
2020-05-26 13:36:13 -07:00
parent 0b1707c117
commit 422e7fd4e6
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vlsi/Makefile
View File

@@ -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:" > $@

2
vlsi/hammer

Submodule vlsi/hammer updated: d5b522ad1a...c917e9386f

2
vlsi/hammer-cadence-plugins

Submodule vlsi/hammer-cadence-plugins updated: cf2304c211...427e5ca305

2
vlsi/hammer-synopsys-plugins

Submodule vlsi/hammer-synopsys-plugins updated: 451e072193...b76ed57f2a

8
vlsi/power.mk
View File

@@ -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)

16
vlsi/sim.mk
View File

@@ -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)