Skip to content

Commit

Permalink
Removed references. Now from config.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
wulffern committed Aug 18, 2024
1 parent a6228e9 commit 4727b03
Show file tree
Hide file tree
Showing 19 changed files with 151 additions and 71 deletions.
31 changes: 0 additions & 31 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,19 @@
path = ip/tech_sky130B
url = https://github.com/wulffern/tech_sky130B
branch = main
[submodule "ip/cicpy"]
path = ip/cicpy
url = https://github.com/wulffern/cicpy
branch = master
[submodule "ip/cicsim"]
path = ip/cicsim
url = https://github.com/wulffern/cicsim
branch = main
[submodule "ip/ciccreator"]
path = ip/ciccreator
url = https://github.com/wulffern/ciccreator
branch = master
[submodule "ip/cpdk"]
path = ip/cpdk
url = https://github.com/wulffern/cpdk
branch = main
[submodule "ip/sun_tr_sky130nm"]
path = ip/sun_tr_sky130nm
url = https://github.com/wulffern/sun_tr_sky130nm
branch = main
[submodule "ip/sun_trb_sky130nm"]
path = ip/sun_trb_sky130nm
url = https://github.com/wulffern/sun_trb_sky130nm
branch = main
[submodule "ip/sun_sar9b_sky130nm"]
path = ip/sun_sar9b_sky130nm
url = https://github.com/wulffern/sun_sar9b_sky130nm
branch = main
[submodule "ip/rply_ex0_sky130nm"]
path = ip/rply_ex0_sky130nm
url = https://github.com/wulffern/rply_ex0_sky130nm
branch = main
[submodule "ip/rply_bias_sky130nm"]
path = ip/rply_bias_sky130nm
url = https://github.com/wulffern/rply_bias_sky130nm
branch = main
[submodule "ip/sun_pll_sky130nm"]
path = ip/sun_pll_sky130nm
url = https://github.com/wulffern/sun_pll_sky130nm
branch = main
[submodule "ip/cicconf"]
path = ip/cicconf
url = https://github.com/wulffern/cicconf
branch = main
[submodule "ip/ciccheatgen"]
path = ip/ciccheatgen
url = git@github.com:wulffern/ciccheatgen.git
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

TAG = 0.1.4

dirs = ip/cnr_atr_sky130nm/sim \
ip/sun_tr_sky130nm/work \
ip/sun_sar9b_sky130nm/work \
ip/sun_pll_sky130nm/work \
ip/sun_tr_sky130nm/sim/IVX1_CV \
dirs = ip/rply_ex0_sky130nm/sim/RPLY_EX0 \
ip/rply_ex0_sky130nm/work


cwd = ${shell pwd}
Expand All @@ -17,6 +14,7 @@ SITE=${shell pwd}/docs
OPT=

test:

${foreach d, ${dirs}, cd ${cwd}; cd ${d} && make test|| exit ;}

foss-run:
Expand Down
54 changes: 54 additions & 0 deletions docker/Dockerfile_24.04
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#- This docker file is not really to run the tools in docker. It's mostly for testing that the full install works
# in linux
FROM ubuntu:24.04
MAINTAINER Carsten Wulff <carsten@wulff.no>

RUN ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone

RUN apt-get update && \
apt-get -y install sudo make \
openssh-server && \
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

RUN useradd -ms /bin/bash aicex
RUN echo "aicex:aicex" | chpasswd && adduser aicex sudo
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

RUN echo "X11UseLocalhost no\n" >> /etc/ssh/sshd_config

RUN echo "set num_threads=8\nset ngbehavior=hsa\nset ng_nomodcheck\n" >> /home/aicex/.spiceinit

EXPOSE 22

ARG DEBIAN_FRONTEND=noninteractive

WORKDIR /opt/
RUN sudo chown aicex:aicex /opt
USER aicex


#- If you want to do a fresh install, comment out the line below
#ARG STEP11=false

COPY tests tests
WORKDIR /opt/tests

ENV LD_LIBRARY_PATH=/opt/eda/lib
ENV PATH=/opt/eda/bin:$HOME/.local/bin:$PATH

#RUN make requirements
#RUN make tt
#RUN make eda_compile
#RUN sudo make eda_install
#RUN python3 -m pip install matplotlib numpy click svgwrite pyyaml pandas tabulate wheel setuptools tikzplotlib
#RUN source install_open_pdk.sh
#RUN sudo rm -rf skywater-pdk
#RUN sudo rm -rf open_pdk

WORKDIR /home/aicex
RUN mkdir /home/aicex/.ssh

ENTRYPOINT sudo service ssh restart && tail -f /dev/null
#CMD ["/usr/bin/sudo", "/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
27 changes: 14 additions & 13 deletions docs/ips.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ This repository is a collection of IPs in Skywater 130nm technology. The
available IPs can be seen in
[ip/config.yaml](https://github.com/wulffern/aicex/blob/main/ip/config.yaml).

| Git repo | Docs | Notes |
|-------------------------------------------------------------------------|---|-------------------------------------------------------------------------------------------------|
| [cicconf](https://github.com/wulffern/cicconf) | | Custom IC Creator Configuration tool |
| [cicpy](https://github.com/wulffern/cicconf) | | Custom IC Creator Python Transpiler |
| [cicsim](https://github.com/wulffern/cicsim) | | Custom IC Creator Simulation Toolbox |
| [ciccreator](https://github.com/wulffern/ciccreator) | [docs](https://wulffern.github.io/ciccreator) | Custom IC Creator |
| [sun_sar9b_sky130nm](https://github.com/wulffern/sun_sar9b_sky130nm) | | 9-bit successive approximation analog-to-digital converter |
| [sun_pll_sky130nm](https://github.com/wulffern/sun_pll_sky130nm) | | *General purpose PLL. Should not be used for real designs. Development platform for ciccreator* |
| [sun_tr_sky130nm](https://github.com/wulffern/sun_tr_sky130nm) | | Standard cell libraries for analog schematics |
| [sun_trb_sky130nm](https://github.com/wulffern/sun_trb_sky130nm) | | Standard cell libraries for analog schematics with separate bulk connections |
| [cpdk](https://github.com/wulffern/cpdk) | | Carsten's design kit |
| [tech_sky130B](https://github.com/wulffern/tech_sky130B) | | Technology files for SKY130B |
| [rply_bias_sky130nm](https://github.com/wulffern/rply_bias_sky130nm) | [docs](https://wulffern.github.io/rply_bias_sky130nm) | PTAT current source |
| Git repo | Docs | Notes |
|----------------------------------------------------------------------|-------------------------------------------------------|-------------------------------------------------------------------------------------------------|
| [cicconf](https://github.com/wulffern/cicconf) | | Custom IC Creator Configuration tool |
| [cicpy](https://github.com/wulffern/cicconf) | | Custom IC Creator Python Transpiler |
| [cicsim](https://github.com/wulffern/cicsim) | | Custom IC Creator Simulation Toolbox |
| [ciccreator](https://github.com/wulffern/ciccreator) | [docs](https://wulffern.github.io/ciccreator) | Custom IC Creator |
| [sun_sar9b_sky130nm](https://github.com/wulffern/sun_sar9b_sky130nm) | | 9-bit successive approximation analog-to-digital converter |
| [sun_pll_sky130nm](https://github.com/wulffern/sun_pll_sky130nm) | | *General purpose PLL. Should not be used for real designs. Development platform for ciccreator* |
| [sun_tr_sky130nm](https://github.com/wulffern/sun_tr_sky130nm) | | Standard cell libraries for analog schematics |
| [sun_trb_sky130nm](https://github.com/wulffern/sun_trb_sky130nm) | | Standard cell libraries for analog schematics with separate bulk connections |
| [cpdk](https://github.com/wulffern/cpdk) | | Carsten's design kit |
| [tech_sky130B](https://github.com/wulffern/tech_sky130B) | | Technology files for SKY130B |
| [tech_sky130A](https://github.com/wulffern/tech_sky130A) | | Technology files for SKY130A |
| [rply_bias_sky130nm](https://github.com/wulffern/rply_bias_sky130nm) | [docs](https://wulffern.github.io/rply_bias_sky130nm) | PTAT current source |
| [rply_ex0_sky130nm](https://github.com/wulffern/rply_ex0_sky130nm) | [docs](https://wulffern.github.io/rply_ex0_sky130nm) | Tutorial on sky130nm analog flow |

1 change: 0 additions & 1 deletion ip/ciccheatgen
Submodule ciccheatgen deleted from 3961fe
2 changes: 1 addition & 1 deletion ip/cicconf
Submodule cicconf updated 1 files
+12 −0 Makefile
1 change: 0 additions & 1 deletion ip/ciccreator
Submodule ciccreator deleted from 9ab65a
1 change: 0 additions & 1 deletion ip/cicpy
Submodule cicpy deleted from 3eccfa
2 changes: 1 addition & 1 deletion ip/cicsim
76 changes: 71 additions & 5 deletions ip/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,30 @@ options:
template:
ip: tech_sky130A/cicconf/ip_template.yaml
project: jnw
technology: sky130nm

technology: sky130A

#-------------------------------------------------------
# Tools
#-------------------------------------------------------

#- Configuration. Cloining, update, status of this file
cicconf:
remote: git@github.com:wulffern/cicconf.git
revision: main

#- Simulation orchestration
cicsim:
remote: git@github.com:wulffern/cicsim.git
revision: main
on_clone: python3 -m pip install --user -e .

#- Custom IC Creator - compiled analog blocks
ciccreator:
remote: git@github.com:wulffern/ciccreator.git
revision: master
on_clone: cicconf clone --https

#- Transpiler and layout support
cicpy:
remote: git@github.com:wulffern/cicpy.git
revision: master
Expand All @@ -30,12 +37,17 @@ cicpy:
#-------------------------------------------------------
# TECHs
#-------------------------------------------------------
#- Carsten's PDK. Borders, symbols, loop stability
cpdk:
remote: git@github.com:wulffern/cpdk.git
revision: main

#- Technology used by sun/rply/cnr projects
tech_sky130B:
remote: git@github.com:wulffern/tech_sky130B.git
revision: main

#- Technology used by Tiny Tapeout
tech_sky130A:
remote: git@github.com:wulffern/tech_sky130A.git
revision: main
Expand All @@ -44,63 +56,117 @@ tech_sky130A:
# SUN (2022)
# "It's not you, it's me, I don't like you." – Ayrun Sun, Farscape
#-------------------------------------------------------

#- PLL design (sch,lay)
sun_pll_sky130nm:
remote: git@github.com:wulffern/sun_pll_sky130nm.git
revision: main

#- Transistor library (sky130B,sch,lay)
sun_tr_sky130nm:
remote: git@github.com:wulffern/sun_tr_sky130nm.git
revision: main

#- Transistor library (sky130B,sch,lay)
sun_trb_sky130nm:
remote: git@github.com:wulffern/sun_trb_sky130nm.git
revision: main

#- 9-bit SAR (sky130A,sch,lay)
sun_sar9b_sky130nm:
remote: git@github.com:wulffern/sun_sar9b_sky130nm.git
revision: main


#-------------------------------------------------------
# RPLY (2023)
#"I say we take off and nuke the site from orbit.
# It's the only way to be sure.", Ellen Ripley, Aliens
#-------------------------------------------------------

#- PTAT bias source (sky130B, sch only)
rply_bias_sky130nm:
remote: git@github.com:wulffern/rply_bias_sky130nm.git
revision: main

#- Skywater 130nm tutorial (sky130B, sch/lay)
rply_ex0_sky130nm:
remote: git@github.com:wulffern/rply_ex0_sky130nm.git
revision: main


#-------------------------------------------------------
# CNR(2024)
#"In an insane world, it was the sanest choice."
# - Sarah Connor, Terminator 2: Judgment Day
#-------------------------------------------------------

#- Analog transitor library (sky130B, sch/lay)
cnr_atr_sky130nm:
remote: git@github.com:wulffern/cnr_atr_sky130nm.git
revision: main

#- Carsten's favorite differential OTA (sch only)
cnr_ota_sky130nm:
remote: git@github.com:wulffern/cnr_ota_sky130nm.git
revision: main

#- Groups
#- Carsten's Sigma-Delta temperature sensor (sch only)
cnr_gr00_sky130nm:
remote: git@github.com:analogicus/cnr_gr00_sky130nm.git
revision: main

#- Temperature sensor - Group 2 (Alireza, Bjørn, Sheikha, Youssef )
# - PTAT bandgap core with PTAT current output and 1.2 VREF
# - PTAT current into capacitor
# - Comparator between VREF and capacitor voltage to check charge delay
# SCH: CNR_GR02, LAY: CNR_GR02, DRC: OK, LVS: NOK
cnr_gr02_sky130nm:
remote: git@github.com:analogicus/cnr_gr02_sky130nm.git
revision: main

#- Temperature sensor - Group 3 (Daniel, Mangus, Martin, Vetle)
# - PTAT bandgap core with PTAT current output and 1.2 VREF
# - PTAT current into capacitor
# - Comparator between VREF and capacitor voltage to check charge delay
# SCH: TOPLEVEL, LAY: TOPLEVEL, DRC: OK, LVS: NOK (missing files)
cnr_gr03_sky130nm:
remote: git@github.com:analogicus/cnr_gr03_sky130nm.git
revision: main

#- Temperature sensor - Group 4 (Syver, Leidulf, Mohammad, Peter)
# - PTAT bandgap core with PTAT current output
# - PTAT current into capacitor
# - Comparator between VDD_1V8/2 and capacitor voltage to check charge delay
# SCH: CNR_GR04, LAY: CNR_GR04, DRC: NOK, LVS: NOK
cnr_gr04_sky130nm:
remote: git@github.com:analogicus/cnr_gr04_sky130nm.git
revision: main

#- Temperature sensor - Group 5 (Trond, Markus, Andrea)
# - PTAT bandgap core with PTAT current output
# - PTAT current into capacitor
# - Comparator between VDD_1V8/2 and capacitor voltage to check charge delay
# SCH: final, LAY: final, DRC: OK, LVS: NOK (missing files)
cnr_gr05_sky130nm:
remote: git@github.com:analogicus/cnr_gr05_sky130nm.git
revision: main

#-------------------------------------------------------
# JNW(2025
# "You can use logic to justify almost anything. That's its power. And its flaw."
# - Kathryn Janeway, Star Trek Voyager: Prime Factors
#-------------------------------------------------------

#- Analog transistors
jnw_atr_sky130A:
remote: git@github.com:analogicus/jnw_atr_sky130a.git
revision: main

#- Standard library
jnw_tr_sky130A:
remote: git@github.com:analogicus/jnw_tr_sky130a.git
revision: main

#- Temperature sensor? (Carsten)
jnw_gr00_sky130A:
remote: git@github.com:analogicus/jnw_gr00_sky130a.git
revision: main
2 changes: 1 addition & 1 deletion ip/cpdk
1 change: 0 additions & 1 deletion ip/rply_bias_sky130nm
Submodule rply_bias_sky130nm deleted from 329736
2 changes: 1 addition & 1 deletion ip/rply_ex0_sky130nm
1 change: 0 additions & 1 deletion ip/sun_pll_sky130nm
Submodule sun_pll_sky130nm deleted from 390730
1 change: 0 additions & 1 deletion ip/sun_sar9b_sky130nm
Submodule sun_sar9b_sky130nm deleted from 47259c
1 change: 0 additions & 1 deletion ip/sun_tr_sky130nm
Submodule sun_tr_sky130nm deleted from ccd959
1 change: 0 additions & 1 deletion ip/sun_trb_sky130nm
Submodule sun_trb_sky130nm deleted from a3838e
2 changes: 1 addition & 1 deletion ip/tech_sky130B
Submodule tech_sky130B updated 1 files
+132 −0 magic/macros.txt
8 changes: 4 additions & 4 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MAGIC_VER=master
NETGEN_VER=master
NGSPICE_VER=master
IVERILOG_VER=master
YOSYS_VER=master
YOSYS_VER=main
GTKWAVE_VER=3.3.117
OPENROAD_VER=master

Expand Down Expand Up @@ -323,7 +323,7 @@ ngspice_install:
#--------------------------------------------------------------------
iverilog:
git clone https://github.com/steveicarus/iverilog.git
cd iverilog && git checkout ${MAGIC_VER}
cd iverilog && git checkout ${IVERILOG_VER}

iverilog_compile: iverilog
cd iverilog && git pull && \
Expand All @@ -337,12 +337,12 @@ iverilog_install:
# yosys
#--------------------------------------------------------------------
yosys:
git clone https://github.com/YosysHQ/yosys.git
git clone --recursive https://github.com/YosysHQ/yosys.git
cd yosys && git checkout ${YOSYS_VER}

yosys_compile: yosys
cd yosys && git pull && make config-gcc PREFIX=${EDA_PREFIX} \
&& make PREFIX=${EDA_PREFIX}
&& make -j 8 PREFIX=${EDA_PREFIX}

yosys_install:
cd yosys && sudo make PREFIX=${EDA_PREFIX} install
Expand Down

0 comments on commit 4727b03

Please sign in to comment.