From cfba37afc93a66922dcd745e1d3274a84206d6a4 Mon Sep 17 00:00:00 2001
From: Harrison Liew <harrisonliew@gmail.com>
Date: Thu, 19 Sep 2019 22:43:18 -0700
Subject: [PATCH] bump hammer, remove saed32

---
 scripts/init-vlsi.sh        |  2 +-
 vlsi/Makefile               |  2 +-
 vlsi/example.yml            | 16 +++++++++-------
 vlsi/hammer                 |  2 +-
 vlsi/hammer-cadence-plugins |  2 +-
 vlsi/hammer-mentor-plugins  |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/init-vlsi.sh b/scripts/init-vlsi.sh
index aaf015ca..bbc562d4 100755
--- a/scripts/init-vlsi.sh
+++ b/scripts/init-vlsi.sh
@@ -10,6 +10,6 @@ git submodule update --init --recursive vlsi/hammer-synopsys-plugins
 git submodule update --init --recursive vlsi/hammer-mentor-plugins
 
 # Initialize HAMMER tech plugin
-if [[ $1 != *asap7* ]] && [[ $1 != *saed32* ]]; then
+if [[ $1 != *asap7* ]]; then
     git submodule update --init --recursive vlsi/hammer-$1-plugin
 fi
diff --git a/vlsi/Makefile b/vlsi/Makefile
index 52d5b947..d3f3d45f 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -19,7 +19,7 @@ include $(base_dir)/variables.mk
 #########################################################################################
 sim_name           ?= vcs # needed for GenerateSimFiles, but is unused
 tech_name          ?= asap7
-tech_dir           ?= $(if $(filter $(tech_name), asap7 saed32), $(vlsi_dir)/hammer/src/hammer-vlsi/technology/$(tech_name), $(vlsi_dir)/hammer-$(tech_name)-plugin/$(tech_name))
+tech_dir           ?= $(if $(filter $(tech_name), asap7), $(vlsi_dir)/hammer/src/hammer-vlsi/technology/$(tech_name), $(vlsi_dir)/hammer-$(tech_name)-plugin/$(tech_name))
 SMEMS_COMP         ?= $(tech_dir)/sram-compiler.json
 SMEMS_CACHE        ?= $(tech_dir)/sram-cache.json
 SMEMS_HAMMER       ?= $(build_dir)/$(long_name).mems.hammer.json
diff --git a/vlsi/example.yml b/vlsi/example.yml
index 7e434cb6..bf6d135d 100644
--- a/vlsi/example.yml
+++ b/vlsi/example.yml
@@ -1,9 +1,8 @@
 # Technology Setup
 # Technology used is ASAP7
 vlsi.core.technology: asap7
-vlsi.core.node: 7
+# Specify dir with ASAP7 tarball
 technology.asap7.tarball_dir: "SPECIFY DIR WITH ASAP7 TARBALL"
-technology.asap7.install_dir: "SPECIFY EXTRACTED DIR HERE IF NOT USING TARBALL"
 
 vlsi.core.max_threads: 12
 
@@ -22,9 +21,8 @@ vlsi.inputs.mmmc_corners: [
 ]
 
 # Specify clock signals
-# ASAP7 bug: period value should actually be in ps
 vlsi.inputs.clocks: [
-  {name: "clock", period: "1000ns", uncertainty: "0.1ns"}
+  {name: "clock", period: "1ns", uncertainty: "0.1ns"}
 ]
 
 # Generate Make include to aid in flow 
@@ -44,12 +42,11 @@ par.generate_power_straps_options:
       - M7
       - M8
       - M9
-    track_width: 14
-    track_width_M3: 7
-    track_width_M5: 24
+    track_width: 5
     track_width_M8: 6
     track_width_M9: 6
     track_spacing: 0
+    track_start: 10
     power_utilization: 0.05
     power_utilization_M8: 1.0
     power_utilization_M9: 1.0
@@ -114,6 +111,11 @@ vlsi.technology.extra_libraries:
         VDD: "0.77 V"
         GND: "0 V"
 
+# Because the DCO is a dummy layout, we treat it as a physical-only cell
+par.inputs.physical_only_cells_mode: append
+par.inputs.physical_only_cells_list:
+  - ExampleDCO
+
 # SRAM Compiler compiler options
 vlsi.core.sram_generator_tool: "sram_compiler"
 vlsi.core.sram_generator_tool_path: ["SPECIFY LOCATION OF SRAM GENERATOR IN TECH PLUGIN"]
diff --git a/vlsi/hammer b/vlsi/hammer
index 6c31fbe7..4f06ceef 160000
--- a/vlsi/hammer
+++ b/vlsi/hammer
@@ -1 +1 @@
-Subproject commit 6c31fbe7eb57df98c5815ae4f7ba2ba904f74b0f
+Subproject commit 4f06ceef41c0e3d4a9a5f000cf5a120729edc85d
diff --git a/vlsi/hammer-cadence-plugins b/vlsi/hammer-cadence-plugins
index a9762c34..06ce365b 160000
--- a/vlsi/hammer-cadence-plugins
+++ b/vlsi/hammer-cadence-plugins
@@ -1 +1 @@
-Subproject commit a9762c344ea247eb2174e720bf8507daf3226933
+Subproject commit 06ce365b36e4b8520372968a5ef2a301afe8d5d6
diff --git a/vlsi/hammer-mentor-plugins b/vlsi/hammer-mentor-plugins
index 4daaea36..33ccdccf 160000
--- a/vlsi/hammer-mentor-plugins
+++ b/vlsi/hammer-mentor-plugins
@@ -1 +1 @@
-Subproject commit 4daaea36f805ba71b55ceb7f5579229eac935045
+Subproject commit 33ccdccf2c04a26cceeeb03a29b9cfad38908328