From 3dc7b93f57178c7d03a65347ccc5a7ece7df7d9d Mon Sep 17 00:00:00 2001
From: "James E. Stine" <james.stine@okstate.edu>
Date: Fri, 17 Nov 2023 16:25:35 -0600
Subject: [PATCH] Revert removal of WRAPPER option that is not prudent

---
 synthDC/Makefile          | 40 ++++++---------------------------------
 synthDC/ppa/ppaSynth.py   |  4 ++--
 synthDC/scripts/synth.tcl | 28 ++++-----------------------
 3 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/synthDC/Makefile b/synthDC/Makefile
index 3e344e8d2..470ec8f47 100755
--- a/synthDC/Makefile
+++ b/synthDC/Makefile
@@ -1,28 +1,7 @@
-#####################
-# Makefile
-#
-# Written: ssanghai@hmc.edu, mmasserfrye@hmc.edu, james.stine@okstate.edu 15 November 2023
-#
-# Purpose: Makefile to be used for synthesis using DC
-#
-# A component of the Wally configurable RISC-V project.
-#
-# Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file 
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You 
-# may obtain a copy of the License at
-#
-# https:#solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the 
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-# either express or implied. See the License for the specific language governing permissions 
-# and limitations under the License.
-################################################
-
+#  
+# Makefile for synthesis
+# Shreya Sanghai (ssanghai@hmc.edu) 2/28/2022
+# Madeleine Masser-Frye (mmasserfrye@hmc.edu) 1/27/2023
 NAME := synth
 # defaults
 export DESIGN ?= wallypipelinedcore
@@ -42,18 +21,11 @@ export MAXOPT ?= 0
 export DRIVE ?= FLOP
 export USESRAM ?= 0
 export WIDTH ?= 32
-export WRAPPER ?= 1
-export SAIFPOWER ?= 0
 
 time := $(shell date +%F-%H-%M)
 hash := $(shell git rev-parse --short HEAD)
-# This is done to create different naming conventions to help the PPA python 
-# TODO: cleanup later to utilize better parsing/lexing
-ifeq ($(WRAPPER), 0)
-	export OUTPUTDIR := runs/$(DESIGN)_$(WIDTH)_$(CONFIG)_$(TECH)_$(FREQ)_MHz_$(time)_$(TITLE)_$(hash)
-else
-	export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(MOD)_$(TECH)_$(FREQ)_MHz_$(time)_$(TITLE)_$(hash)
-endif
+export OUTPUTDIR := runs/$(DESIGN)_$(CONFIG)_$(TECH)_$(FREQ)_MHz_$(time)_$(TITLE)_$(hash)
+export SAIFPOWER ?= 0
 
 OLDCONFIGDIR ?= ${WALLY}/config
 export CONFIGDIR ?= $(OUTPUTDIR)/config
diff --git a/synthDC/ppa/ppaSynth.py b/synthDC/ppa/ppaSynth.py
index 0c4744c26..30fe1254f 100755
--- a/synthDC/ppa/ppaSynth.py
+++ b/synthDC/ppa/ppaSynth.py
@@ -11,7 +11,7 @@ from multiprocessing import Pool
 from ppaAnalyze import synthsfromcsv
 
 def runCommand(module, width, tech, freq):
-    command = "make synth DESIGN={} WIDTH={} TECH={} DRIVE=INV FREQ={} MAXOPT=1 MAXCORES=1 WRAPPER=0".format(module, width, tech, freq)
+    command = "make synth DESIGN={} WIDTH={} TECH={} DRIVE=INV FREQ={} MAXOPT=1 MAXCORES=1".format(module, width, tech, freq)
     subprocess.call(command, shell=True)
 
 def deleteRedundant(synthsToRun):
@@ -95,4 +95,4 @@ if __name__ == '__main__':
 
 pool.starmap(runCommand, synthsToRun)
 pool.close()
-pool.join()
+pool.join()
\ No newline at end of file
diff --git a/synthDC/scripts/synth.tcl b/synthDC/scripts/synth.tcl
index 668b1c215..cd4d6ff27 100755
--- a/synthDC/scripts/synth.tcl
+++ b/synthDC/scripts/synth.tcl
@@ -1,27 +1,7 @@
-#####################
-# synth.tcl
 #
-# Written: james.stine@okstate.edu 15 November 2023
+# Synthesis Synopsys Flow
+# james.stine@okstate.edu 27 Sep 2015
 #
-# Purpose: Baseline DC Tcl file
-#
-# A component of the Wally configurable RISC-V project.
-#
-# Copyright (C) 2021 Harvey Mudd College & Oklahoma State University
-#
-# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
-#
-# Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file 
-# except in compliance with the License, or, at your option, the Apache License version 2.0. You 
-# may obtain a copy of the License at
-#
-# https:#solderpad.org/licenses/SHL-2.1/
-#
-# Unless required by applicable law or agreed to in writing, any work distributed under the 
-# License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-# either express or implied. See the License for the specific language governing permissions 
-# and limitations under the License.
-################################################
 
 # start run clock
 set t1 [clock seconds]
@@ -46,7 +26,6 @@ set saifpower $::env(SAIFPOWER)
 set maxopt $::env(MAXOPT)
 set drive $::env(DRIVE)
 set width $::env(WIDTH)
-set wrapper $::env(WRAPPER)
 
 eval file copy -force [glob ${cfg}/*.vh] {$outputDir/hdl/}
 eval file copy -force [glob ${hdl_src}/cvw.sv] {$outputDir/hdl/}
@@ -54,6 +33,7 @@ eval file copy -force [glob ${hdl_src}/*/*.sv] {$outputDir/hdl/}
 eval file copy -force [glob ${hdl_src}/*/*/*.sv] {$outputDir/hdl/}
 
 # Check if a wrapper is needed and create it (to pass parameters when cvw_t parameters are used)
+set wrapper 0
 if {[catch {eval exec grep "cvw_t" $outputDir/hdl/$::env(DESIGN).sv}] == 0} {
     echo "Creating wrapper"
     set wrapper 1
@@ -460,7 +440,7 @@ set filename [format "%s%s" $outputDir  "/reports/cell.rep"]
 #redirect $filename { report_cell [get_cells -hier *] }  # not too useful
 
 set filename [format "%s%s" $outputDir  "/reports/power.rep"]
-redirect $filename { report_power -analysis_effort high -hierarchy -levels 1 }
+redirect $filename { report_power -hierarchy -levels 1 }
 
 set filename [format "%s%s" $outputDir  "/reports/constraint.rep"]
 redirect $filename { report_constraint }