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

Merge pull request #1662 from ucb-bar/vlsi-fixes

Browse Source 
Hammer bump and minor VLSI fixes
This commit is contained in:
Abraham Gonzalez
2023-11-15 13:13:20 -08:00
committed by GitHub
parent c90d054bb0 842c9f01a7
commit bfa822aec3
8 changed files with 510 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/chipyard-full-flow.yml vendored
View File

@@ -124,7 +124,7 @@ jobs:
conda config --add channels litex-hub conda config --add channels litex-hub
# installs for example-sky130.yml # installs for example-sky130.yml
conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 conda create -y --prefix ./.conda-sky130 open_pdks.sky130a=1.0.457_0_g32e8f23
git clone https://github.com/rahulk29/sram22_sky130_macros.git git clone https://github.com/rahulk29/sram22_sky130_macros.git
# installs for example-openroad.yml # installs for example-openroad.yml

2
conda-reqs/chipyard.yaml
View File

@@ -102,7 +102,7 @@ dependencies:
- sty - sty
- open_pdks.sky130a - open_pdks.sky130a
- pip: - pip:
- hammer-vlsi[asap7]==1.1.2 - hammer-vlsi[asap7]==1.2.0
# doc requirements # doc requirements
- sphinx - sphinx

521
conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml generated
View File

File diff suppressed because it is too large Load Diff

509
conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml generated
View File

File diff suppressed because it is too large Load Diff

2
docs/VLSI/Sky130-Commercial-Tutorial.rst
View File

@@ -60,7 +60,7 @@ The prerequisite setup for this tutorial may eventually be scripted, but for now
.. code-block:: shell .. code-block:: shell
# download all files for Sky130A PDK # download all files for Sky130A PDK
conda create -c litex-hub --prefix ~/.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 conda create -c litex-hub --prefix ~/.conda-sky130 open_pdks.sky130a=1.0.457_0_g32e8f23
# clone the SRAM22 Sky130 SRAM macros # clone the SRAM22 Sky130 SRAM macros
git clone https://github.com/rahulk29/sram22_sky130_macros ~/sram22_sky130_macros git clone https://github.com/rahulk29/sram22_sky130_macros ~/sram22_sky130_macros

2
docs/VLSI/Sky130-OpenROAD-Tutorial.rst
View File

@@ -73,7 +73,7 @@ Note that we create a new conda environment for each tool because some of them h
conda config --add channels defaults conda config --add channels defaults
# download all files for Sky130A PDK # download all files for Sky130A PDK
conda create -c litex-hub --prefix ~/.conda-sky130 open_pdks.sky130a=1.0.399_0_g63dbde9 conda create -c litex-hub --prefix ~/.conda-sky130 open_pdks.sky130a=1.0.457_0_g32e8f23
# clone the SRAM22 Sky130 SRAM macros # clone the SRAM22 Sky130 SRAM macros
git clone https://github.com/rahulk29/sram22_sky130_macros ~/sram22_sky130_macros git clone https://github.com/rahulk29/sram22_sky130_macros ~/sram22_sky130_macros

2
vlsi/Makefile
View File

@@ -42,7 +42,7 @@ HAMMER_EXEC ?= $(if $(filter $(tech_name),sky130),\
./example-vlsi-sky130,\ ./example-vlsi-sky130,\
./example-vlsi) ./example-vlsi)
VLSI_TOP ?= $(TOP) VLSI_TOP ?= $(TOP)
VLSI_MODEL_DUT_NAME ?= chiptop VLSI_MODEL_DUT_NAME ?= chiptop0
# If overriding, this should be relative to $(vlsi_dir) # If overriding, this should be relative to $(vlsi_dir)
VLSI_OBJ_DIR ?= build VLSI_OBJ_DIR ?= build
ifneq ($(CUSTOM_VLOG),) ifneq ($(CUSTOM_VLOG),)

6
vlsi/sim.mk
View File

@@ -51,7 +51,11 @@ $(SIM_DEBUG_CONF): $(sim_common_files) check-binary
mkdir -p $(dir $@) mkdir -p $(dir $@)
mkdir -p $(output_dir) mkdir -p $(output_dir)
echo "sim.inputs:" > $@ echo "sim.inputs:" > $@
echo " defines: ['DEBUG']" >> $@ echo " defines:" >> $@
echo " - 'DEBUG'" >> $@;
ifndef USE_VPD
echo " - 'FSDB=1'" >> $@;
endif
echo " defines_meta: 'append'" >> $@ echo " defines_meta: 'append'" >> $@
echo " execution_flags:" >> $@ echo " execution_flags:" >> $@
for x in $(VERBOSE_FLAGS) $(call get_waveform_flag,$(call get_sim_out_name,$(BINARY))); do \ for x in $(VERBOSE_FLAGS) $(call get_waveform_flag,$(call get_sim_out_name,$(BINARY))); do \