From 0863e8d1ce81647cefb73212cc4c363df3cbc85f Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Mon, 8 Jun 2020 11:02:27 -0700 Subject: [PATCH 1/2] Enable hammer simulations to run in parallel Bumps hammer and its plugins Updates to makefile for running simulations without BINARY Enables make power-par to automatically connect from sim-par --- vlsi/Makefile | 4 ++++ vlsi/hammer | 2 +- vlsi/hammer-cadence-plugins | 2 +- vlsi/hammer-synopsys-plugins | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/vlsi/Makefile b/vlsi/Makefile index 7fbfcc2ca9..42af7ba240 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -129,7 +129,9 @@ $(SIM_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_file echo ' - "'$$x'"' >> $@; \ done echo " execution_flags_meta: 'append'" >> $@ +ifneq ($(BINARY), ) echo " benchmarks: ['$(BINARY)']" >> $@ +endif echo " tb_dut: 'testHarness.$(VLSI_HARNESS_DUT_NAME)'" >> $@ $(SIM_DEBUG_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_files) @@ -158,12 +160,14 @@ $(POWER_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_fi echo "power.inputs:" > $@ echo " tb_dut: 'testHarness/$(VLSI_HARNESS_DUT_NAME)'" >> $@ echo " database: '$(OBJ_DIR)/par-rundir/$(VLSI_TOP)_FINAL'" >> $@ +ifneq ($(BINARY), ) echo " saifs: [" >> $@ echo " '$(OBJ_DIR)/sim-par-rundir/$(notdir $(BINARY))/ucli.saif'" >> $@ echo " ]" >> $@ echo " waveforms: [" >> $@ #echo " '$(OBJ_DIR)/sim-par-rundir/$(notdir $(BINARY))/$(sim_out_name).vcd'" >> $@ echo " ]" >> $@ +endif echo " start_times: ['0ns']" >> $@ echo " end_times: [" >> $@ echo " '`bc <<< $(timeout_cycles)*$(CLOCK_PERIOD)`ns'" >> $@ diff --git a/vlsi/hammer b/vlsi/hammer index 9d83bbadc0..a05f97b1f7 160000 --- a/vlsi/hammer +++ b/vlsi/hammer @@ -1 +1 @@ -Subproject commit 9d83bbadc0caaa7f81b4929c4e32333fc5a8d900 +Subproject commit a05f97b1f75ba924df117dfc34a11b1ada9406c1 diff --git a/vlsi/hammer-cadence-plugins b/vlsi/hammer-cadence-plugins index f644138bab..7ad99d445f 160000 --- a/vlsi/hammer-cadence-plugins +++ b/vlsi/hammer-cadence-plugins @@ -1 +1 @@ -Subproject commit f644138bab11075f267a3f1d72108da13c8a05ab +Subproject commit 7ad99d445f3121662aee6531950f6a9ac2da2256 diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins index ef163445ee..78dac526c0 160000 --- a/vlsi/hammer-synopsys-plugins +++ b/vlsi/hammer-synopsys-plugins @@ -1 +1 @@ -Subproject commit ef163445eec6362fa6a9bf6be0bd18a5d36c707e +Subproject commit 78dac526c0864ee826b989619e27036175b5edee From 629ca805e41ea19b9fd2dae9c89863bea1a97aeb Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Wed, 10 Jun 2020 13:46:43 -0700 Subject: [PATCH 2/2] Bump hammer branches to master after merge --- vlsi/hammer | 2 +- vlsi/hammer-cadence-plugins | 2 +- vlsi/hammer-synopsys-plugins | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vlsi/hammer b/vlsi/hammer index a05f97b1f7..bd94e1ed7a 160000 --- a/vlsi/hammer +++ b/vlsi/hammer @@ -1 +1 @@ -Subproject commit a05f97b1f75ba924df117dfc34a11b1ada9406c1 +Subproject commit bd94e1ed7a5f70fe85ea833cb89836efefe53dc7 diff --git a/vlsi/hammer-cadence-plugins b/vlsi/hammer-cadence-plugins index 7ad99d445f..d905828d68 160000 --- a/vlsi/hammer-cadence-plugins +++ b/vlsi/hammer-cadence-plugins @@ -1 +1 @@ -Subproject commit 7ad99d445f3121662aee6531950f6a9ac2da2256 +Subproject commit d905828d68aeb4ff5619418807a8aa6d7376d796 diff --git a/vlsi/hammer-synopsys-plugins b/vlsi/hammer-synopsys-plugins index 78dac526c0..e5ec0da8ad 160000 --- a/vlsi/hammer-synopsys-plugins +++ b/vlsi/hammer-synopsys-plugins @@ -1 +1 @@ -Subproject commit 78dac526c0864ee826b989619e27036175b5edee +Subproject commit e5ec0da8ad471b075de62989001b282e537416d0