Merge branch 'klayout' into dev

.github/workflows/ci.yml

@@ -1,44 +1,56 @@
 name: ci
 on: [push]
 jobs:
-  scn4me_subm:
+  regress:
     runs-on: self-hosted
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
-      - name: SCMOS test
+      - name: Docker pull
+        run: docker pull vlsida/openram-ubuntu:latest
+      - name: PDK Install
         run: |
-         . /home/github-runner/setup-paths.sh
          export OPENRAM_HOME="${{ github.workspace }}/compiler"
-         export OPENRAM_TECH="${{ github.workspace }}/technology:/software/PDKs/skywater-tech"
+         export OPENRAM_TECH="${{ github.workspace }}/technology"
-         export OPENRAM_TMP="${{ github.workspace }}/scn4me_subm_temp"
+         #cd $OPENRAM_HOME/tests
+         #export PDK_ROOT="${{ github.workspace }}/pdk"
+         #make pdk
+         #make install
+      - name: Regress
+        run: |
+         export OPENRAM_HOME="${{ github.workspace }}/compiler"
+         export OPENRAM_TECH="${{ github.workspace }}/technology"
+         #cd $OPENRAM_HOME/.. && make pdk && make install
+         #export OPENRAM_TMP="${{ github.workspace }}/scn4me_subm_temp"
          #python3-coverage run -p $OPENRAM_HOME/tests/regress.py -j 12 -t scn4m_subm
-         $OPENRAM_HOME/tests/regress.py -j 24 -t scn4m_subm
+         #$OPENRAM_HOME/tests/regress.py -j 24 -t scn4m_subm
+         cd $OPENRAM_HOME/tests
+         make -k -j 48
       - name: Archive
         if: ${{ failure() }}
         uses: actions/upload-artifact@v2
         with:
-         name: scn4me_subm Archives
+         name: Regress Archives
-         path: ${{ github.workspace }}/*.zip
+         path: ${{ github.workspace }}/compiler/tests/results/*
-  freepdk45:
+#  freepdk45:
-    runs-on: self-hosted
+#    runs-on: self-hosted
-    steps:
+#    steps:
-      - name: Checkout code
+#      - name: Checkout code
-        uses: actions/checkout@v1
+#        uses: actions/checkout@v1
-      - name: FreePDK45 test
+#      - name: FreePDK45 test
-        run: |
+#        run: |
-         . /home/github-runner/setup-paths.sh
+#         . /home/github-runner/setup-paths.sh
-         export OPENRAM_HOME="${{ github.workspace }}/compiler"
+#         export OPENRAM_HOME="${{ github.workspace }}/compiler"
-         export OPENRAM_TECH="${{ github.workspace }}/technology:/software/PDKs/skywater-tech"
+#         export OPENRAM_TECH="${{ github.workspace }}/technology:/software/PDKs/skywater-tech"
-         export OPENRAM_TMP="${{ github.workspace }}/freepdk45_temp"
+#         export OPENRAM_TMP="${{ github.workspace }}/freepdk45_temp"
-         #python3-coverage run -p $OPENRAM_HOME/tests/regress.py -j 12 -t freepdk45
+#         #python3-coverage run -p $OPENRAM_HOME/tests/regress.py -j 12 -t freepdk45
-         $OPENRAM_HOME/tests/regress.py -j 24 -t freepdk45
+#         $OPENRAM_HOME/tests/regress.py -j 24 -t freepdk45
-      - name: Archive
+#      - name: Archive
-        if: ${{ failure() }}
+#        if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+#        uses: actions/upload-artifact@v2
-        with:
+#        with:
-         name: FreePDK45 Archives
+#         name: FreePDK45 Archives
-         path: ${{ github.workspace }}/*.zip
+#         path: ${{ github.workspace }}/*.zip
   # coverage_stats:
   #   if: ${{ always() }}
   #   needs: [scn4me_subm, freepdk45]

Makefile

@@ -186,10 +186,11 @@ mount:
 	@docker run -it -v $(TOP_DIR):/openram \
 		-v $(SKY130_PDK):$(SKY130_PDK) \
 		-e PDK_ROOT=$(PDK_ROOT) \
-                -e OPENRAM_HOME=/openram/compiler \
+        -e OPENRAM_HOME=/openram/compiler \
-                -e OPENRAM_TECH=/openram/technology \
+        -e OPENRAM_TECH=/openram/technology \
+		-v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
 		--user $(UID):$(GID) \
-                vlsida/openram-ubuntu:latest
+        vlsida/openram-ubuntu:latest
 .PHONY: mount
 
 clean:

compiler/tests/21_hspice_delay_test.py

@@ -15,6 +15,7 @@ from globals import OPTS
 from sram_factory import factory
 import debug
 
+@unittest.skip("SKIPPING 21_hspice_delay_test")
 class timing_sram_test(openram_test):
 
     def runTest(self):

compiler/tests/21_hspice_setuphold_test.py

@@ -14,6 +14,7 @@ import globals
 from globals import OPTS
 
 
+@unittest.skip("SKIPPING 21_hspice_setuphold_test")
 class timing_setup_test(openram_test):
 
     def runTest(self):

compiler/tests/21_ngspice_delay_global_test.py

@@ -16,6 +16,7 @@ from sram_factory import factory
 import debug
 
 
+@unittest.skip("SKIPPING 21_ngspice_delay_global_test")
 class timing_sram_test(openram_test):
 
     def runTest(self):

compiler/tests/Makefile

@@ -41,6 +41,7 @@ getfile = $(word 2,$(subst /, ,$*))
 WORKING_TECH_TEST_STAMPS=$(foreach T, $(TECHS),$(addprefix $T/,$(WORKING_TEST_STAMPS)))
 
 all: $(WORKING_TECH_TEST_STAMPS)
+	@ls $(TOP_DIR)/compiler/tests/results/*.bad 1> /dev/null 2>&1 && echo "REGRESSION FAIL" && exit 1 || echo "REGRESSION PASS"
 .PHONY: all
 
 # Targets for each individual test
@@ -53,19 +54,21 @@ $(TEST_BASES):
 # To run a test in a given technology
 %.ok:
 #	@echo "Running $(gettech) $(getfile) ... "
-	@mkdir -p results/$*
+	@mkdir -p results/$*/tmp
 	@docker run \
 		-v $(TOP_DIR):/openram \
 		-v $(FREEPDK45):/pdk/freepdk45\
 		-v $(PDK_ROOT):/pdk \
+		-v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
 		--user $(UID):$(GID) \
-		-e OPENRAM_TMP=$(OPENRAM_DIR)/results/$* \
+		-e OPENRAM_TMP=$(OPENRAM_DIR)/results/$*/tmp \
         vlsida/openram-ubuntu:latest \
-		sh -c ". ~/.bashrc && python3 -u $(OPENRAM_DIR)/$(getfile).py -t $(gettech) -k $(ARGS) > $(OPENRAM_DIR)/results/$*.out 2>&1 && touch $(OPENRAM_DIR)/results/$*.ok"
+		sh -c ". /home/cad-user/.bashrc && python3 -u $(OPENRAM_DIR)/$(getfile).py \
-	@test -f $(TOP_DIR)/compiler/tests/results/$*.ok && echo "$* ... PASS!" || echo "$* ... FAIL!"
+		-t $(gettech) -k $(ARGS) -p $(OPENRAM_DIR)/results/$* > $(OPENRAM_DIR)/results/$*.out 2>&1 && touch $(OPENRAM_DIR)/results/$*.ok || touch $(OPENRAM_DIR)/results/$*.bad"
+	@test -f $(TOP_DIR)/compiler/tests/results/$*.ok && echo "$* ... PASS!" && rm -rf $(TOP_DIR)/compiler/tests/results/$* || echo "$* ... FAIL!"
 .DELETE_ON_ERROR: $(TEST_STAMPS)
 
-# This would use the regress.py script to run in parallel instead of 
+# This would use the regress.py script to run in parallel instead of
 # the Makefile.
 #$(TECHS):
 #	@echo "Running $*"
@@ -76,7 +79,7 @@ $(TEST_BASES):
 #		--user $(UID):$(GID) \
 #		-e OPENRAM_TMP=$(OPENRAM_DIR)/results/$@ \
 #		vlsida/openram-ubuntu:latest \
-#        sh -c ". ~/.bashrc && python3 -u $(OPENRAM_DIR)/regress.py -t $@ $(ARGS)"
+#        sh -c ". /home/cad-user/.bashrc && python3 -u $(OPENRAM_DIR)/regress.py -t $@ $(ARGS)"
 #.PHONY: $(TECHS)
 #regress: $(TECHS)
 #.PHONY: regress
@@ -87,6 +90,7 @@ mount:
 		-v $(TOP_DIR):/openram \
 		-v $(FREEPDK45):/pdk/freepdk45 \
 		-v $(PDK_ROOT):/pdk \
+		-v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro \
 		--user $(UID):$(GID) \
         vlsida/openram-ubuntu:latest
 .PHONY: mount

docker/Dockerfile

@@ -67,30 +67,78 @@ RUN ./configure \
  && make install
 RUN rm -rf /root/netgen
 
-#ARG XYCE_COMMIT=b7bb12d81f11d8b50141262537299b09d64b5565
+### Trilinos ###
-#ARG TRILINOS_COMIT=
+ARG TRILINOS_COMMIT=trilinos-release-12-12-1
+WORKDIR /root
+RUN apt-get install --no-install-recommends -y cmake libfftw3-dev mpich libblas-dev liblapack-dev libsuitesparse-dev libfl-dev openmpi-bin libopenmpi-dev gfortran
+RUN git clone --depth 1 --branch ${TRILINOS_COMMIT} https://github.com/trilinos/Trilinos.git
+RUN mkdir /root/Trilinos/build
+WORKDIR /root/Trilinos/build
+RUN cmake \
+    -G "Unix Makefiles" \
+    -DCMAKE_C_COMPILER=mpicc \
+    -DCMAKE_CXX_COMPILER=mpic++ \
+    -DCMAKE_Fortran_COMPILER=mpif77 \
+    -DCMAKE_CXX_FLAGS="-O3 -fPIC" \
+    -DCMAKE_C_FLAGS="-O3 -fPIC" \
+    -DCMAKE_Fortran_FLAGS="-O3 -fPIC" \
+    -DCMAKE_INSTALL_PREFIX=/usr/local/XyceLibs/Parallel \
+    -DCMAKE_MAKE_PROGRAM="make" \
+    -DTrilinos_ENABLE_NOX=ON \
+    -DNOX_ENABLE_LOCA=ON \
+    -DTrilinos_ENABLE_EpetraExt=ON \
+    -DEpetraExt_BUILD_BTF=ON \
+    -DEpetraExt_BUILD_EXPERIMENTAL=ON \
+    -DEpetraExt_BUILD_GRAPH_REORDERINGS=ON \
+    -DTrilinos_ENABLE_TrilinosCouplings=ON \
+    -DTrilinos_ENABLE_Ifpack=ON \
+    -DTrilinos_ENABLE_ShyLU=ON \
+    -DTrilinos_ENABLE_Isorropia=ON \
+    -DTrilinos_ENABLE_AztecOO=ON \
+    -DTrilinos_ENABLE_Belos=ON \
+    -DTrilinos_ENABLE_Teuchos=ON \
+    -DTeuchos_ENABLE_COMPLEX=ON \
+    -DTrilinos_ENABLE_Amesos=ON \
+    -DAmesos_ENABLE_KLU=ON \
+    -DTrilinos_ENABLE_Sacado=ON \
+    -DTrilinos_ENABLE_Kokkos=ON \
+    -DTrilinos_ENABLE_Zoltan=ON \
+    -DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF \
+    -DTrilinos_ENABLE_CXX11=ON \
+    -DTPL_ENABLE_AMD=ON \
+    -DAMD_LIBRARY_DIRS="/usr/lib" \
+    -DTPL_AMD_INCLUDE_DIRS="/usr/include/suitesparse" \
+    -DTPL_ENABLE_BLAS=ON \
+    -DTPL_ENABLE_LAPACK=ON \
+    -DTPL_ENABLE_MPI=ON \
+    /root/Trilinos
+RUN make -j 4 
+RUN make install
+
+ARG XYCE_COMMIT=b7bb12d81f11d8b50141262537299b09d64b5565
+WORKDIR /root
+RUN git clone https://github.com/Xyce/Xyce.git
+WORKDIR /root/Xyce
+RUN git checkout ${XYCE_COMMIT}
+RUN ./bootstrap
+RUN mkdir /root/Xyce/build
+WORKDIR /root/Xyce/build
+RUN ../configure CXXFLAGS="-O3 -std=c++11" \
+    ARCHDIR="/usr/local/XyceLibs/Parallel" \
+    CPPFLAGS="-I/usr/include/suitesparse" \
+    --enable-mpi CXX=mpicxx CC=mpicc F77=mpif77 \
+    --prefix=/usr/local/Xyce/Parallel --enable-shared --enable-xyce-shareable 
+RUN make -j 4 install
 
 ### CLEAN UP ###
 # Remove development tools to save space
-RUN apt-get remove -y build-essential autoconf automake libtool bison flex  tcl-dev tk-dev
+RUN apt-get remove -y build-essential autoconf automake libtool bison flex  tcl-dev tk-dev cmake
 # Cleanup to save some space
 RUN apt-get clean
 RUN rm -rf /var/lib/apt/lists/*
 
 
 # ### SET UP A GENERIC USER ###
-# WORKDIR /p
-# RUN echo "cd ~" >> /etc/skel/.bashrc
-# RUN echo "source /set-paths.sh" >> /etc/skel/.bashrc
-# ADD set-paths.sh /set-paths.sh
-# RUN chmod 755 /set-paths.sh
-
-### ADD ENTRY POINT ###
-# COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-# RUN chmod 755 /usr/local/bin/entrypoint.sh
-# ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-# CMD ["/bin/bash"]
-
 RUN mkdir /home/cad-user
 RUN useradd cad-user
 RUN chown -R cad-user /home/cad-user

docker/set-paths.sh

@@ -1,15 +1,13 @@
 
 export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
 
-export SWROOT=/software
-
 # Klayout
 export KLAYOUT_HOME=/usr/local/klayout
 export PATH=$PATH:$KLAYOUT_HOME
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$KLAYOUT_HOME
 
 # Xyce
-export XYCE_HOME=$SWROOT/Xyce/Parallel
+export XYCE_HOME=/usr/local/Xyce/Parallel
 export XYCE_PATH=$XYCE_HOME/bin
 export PATH=$PATH:$XYCE_PATH
 export XYCE_LIB=$XYCE_HOME/lib