Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DRAFT] custom runners cleanup openroad fix #291

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,480 changes: 741 additions & 739 deletions .github/workflows/Build.yml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions bit/prjoxide/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pushd capnproto-c++-0.8.0
./configure
make -j`nproc` check
sudo make install
export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
popd

git clone https://github.com/capnproto/capnproto-java.git
Expand All @@ -20,6 +21,7 @@ sudo make install
popd

curl --proto '=https' -sSf https://sh.rustup.rs | sh -s -- -y
source "$HOME/.cargo/env"

cd libprjoxide
cargo install --path prjoxide --all-features --root $PREFIX
5 changes: 5 additions & 0 deletions bit/prjoxide/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- autoconf
- libtool
- make
- binutils
- pkg-config

about:
home: https://github.com/gatecat/prjoxide
Expand Down
5 changes: 5 additions & 0 deletions ci/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ if [ -d "workdir/recipe" ]; then
fi
fi

# ssh: Disable host key checking
mkdir -p ~/.ssh
echo "Host *" >> ~/.ssh/config
echo " StrictHostKeyChecking no" >> ~/.ssh/config

echo " GITREV: $GITREV"
echo " CONDA_PATH: $CONDA_PATH"
echo "CONDA_BUILD_ARGS: $CONDA_BUILD_ARGS"
Expand Down
2 changes: 2 additions & 0 deletions misc/openlane/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ test:
requires:
- open_pdks.sky130a
commands:
- export TERM=xterm
- echo $TERM
- PDK=sky130A STD_CELL_LIBRARY=sky130_fd_sc_hd STD_CELL_LIBRARY_OPT=sky130_fd_sc_hd flow.tcl -design inverter

about:
Expand Down
1 change: 1 addition & 0 deletions misc/tree-sitter-verilog/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ requirements:
- {{ compiler('cxx') }}
- nodejs
- python
- make

about:
home: https://github.com/tree-sitter/tree-sitter-verilog
Expand Down
1 change: 1 addition & 0 deletions misc/xschem/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ requirements:
- make
- bison
- flex
- tk
- {{ compiler('c') }}
- {{ cdt('xorg-x11-proto-devel') }} # [linux]
- {{ cdt('libx11-devel') }} # [linux]
Expand Down
2 changes: 1 addition & 1 deletion pnr/openroad/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ requirements:
- {{ compiler('cxx') }}
host:
- python
- libboost 1.73
- libboost 1.80
- eigen 3.3
- spdlog 1.8.1
- readline
Expand Down
2 changes: 2 additions & 0 deletions sim/ngspice/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ requirements:
build:
- autoconf
- automake
- libtool
- make
- bison
- {{ compiler('c') }}
- {{ compiler('cxx') }}

Expand Down
1 change: 1 addition & 0 deletions sim/verilator-uhdm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- bison
- automake
- cmake
- pkg-config
- orderedmultidict
Expand Down
1 change: 1 addition & 0 deletions sim/verilator/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ requirements:
- gxx_linux-64 >=8 [linux]
- autoconf
- make
- help2man
host:
- bison
- flex
Expand Down
2 changes: 2 additions & 0 deletions sv-front/slang/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ build:

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- make
- cmake
- conan
Expand Down
1 change: 1 addition & 0 deletions sv-front/surelog/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ requirements:
- libunwind
- swig
- orderedmultidict
- openjdk

run:
- python {{ python_version }}
Expand Down
5 changes: 5 additions & 0 deletions sv-front/sv-parser/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ build:
script_env:
- CI

requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}

test:
commands:
- parse_sv --version
Expand Down
2 changes: 1 addition & 1 deletion syn/yosys-uhdm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ cd Surelog && \
unset CXX CXXFLAGS LDLIBS LDFLAGS

make -C yosys ENABLE_READLINE=0 CONFIG=conda-linux PROGRAM_PREFIX=uhdm- install -j$(nproc)
make -C $PWD/yosys-symbiflow-plugins/ UHDM_INSTALL_DIR=$PREFIX install -j$(nproc)
make -C yosys-f4pga-plugins/ UHDM_INSTALL_DIR=$PREFIX install -j$(nproc)

19 changes: 10 additions & 9 deletions syn/yosys-uhdm/uhdm-plugin.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
diff --git a/yosys-symbiflow-plugins/Makefile_plugin.common b/yosys-symbiflow-plugins/Makefile_plugin.common
index fd6d86e..7376e41 100644
--- a/yosys-symbiflow-plugins/Makefile_plugin.common
+++ b/yosys-symbiflow-plugins/Makefile_plugin.common
@@ -40,13 +40,13 @@
Submodule yosys-f4pga-plugins contains modified content
diff --git a/yosys-f4pga-plugins/Makefile_plugin.common b/yosys-f4pga-plugins/Makefile_plugin.common
index 45c2640..9b838e0 100644
--- a/yosys-f4pga-plugins/Makefile_plugin.common
+++ b/yosys-f4pga-plugins/Makefile_plugin.common
@@ -46,13 +46,13 @@ TOP_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))

SHELL := /usr/bin/env bash
_MAKEFILES := $(abspath $(filter-out %.d,$(MAKEFILE_LIST)))

-# Either find yosys in system and use its path or use the given path
-YOSYS_PATH ?= $(realpath $(dir $(shell command -v yosys))/..)
Expand All @@ -21,10 +22,10 @@ index fd6d86e..7376e41 100644
endif

CXX ?= $(shell $(YOSYS_CONFIG) --cxx)
diff --git a/yosys-symbiflow-plugins/Makefile_test.common b/yosys-symbiflow-plugins/Makefile_test.common
diff --git a/yosys-f4pga-plugins/Makefile_test.common b/yosys-f4pga-plugins/Makefile_test.common
index 5d72327..75096de 100644
--- a/yosys-symbiflow-plugins/Makefile_test.common
+++ b/yosys-symbiflow-plugins/Makefile_test.common
--- a/yosys-f4pga-plugins/Makefile_test.common
+++ b/yosys-f4pga-plugins/Makefile_test.common
@@ -16,13 +16,13 @@

SHELL := /usr/bin/env bash
Expand Down
33 changes: 16 additions & 17 deletions syn/yosys/makefile-conda-config.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/Makefile b/Makefile
index b37d11c05..c6725d88a 100644
index ca8bc1cb5..8d7171bb0 100644
--- a/Makefile
+++ b/Makefile
@@ -378,6 +378,20 @@ ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC
ABCMKARGS += LIBS="-lpthread -s" ABC_USE_NO_READLINE=0 CC="x86_64-w64-mingw32-gcc" CXX="$(CXX)"
EXE = .exe
@@ -220,6 +220,20 @@ LD = clang++
CXXFLAGS += -std=$(CXXSTD) -Os
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)"

+else ifeq ($(CONFIG),conda-linux)
+CXX = $(notdir $(CC))
Expand All @@ -20,10 +20,10 @@ index b37d11c05..c6725d88a 100644
+CXXFLAGS += -std=c++11 -Os
+ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
+
else ifneq ($(CONFIG),none)
$(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.8, emcc, mxe, msys2-32, msys2-64)
endif
@@ -597,6 +611,11 @@ EXTRA_OBJS += $(1)
ifneq ($(SANITIZER),)
$(info [Clang Sanitizer] $(SANITIZER))
CXXFLAGS += -g -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=$(SANITIZER)
@@ -590,6 +604,11 @@ EXTRA_OBJS += $(1)
.SECONDARY: $(1)
endef

Expand All @@ -35,22 +35,21 @@ index b37d11c05..c6725d88a 100644
ifeq ($(PRETTY), 1)
P_STATUS = 0
P_OFFSET = 0
@@ -1099,6 +1118,12 @@ config-gprof: clean
echo 'CONFIG := gcc' > Makefile.conf
echo 'ENABLE_GPROF := 1' >> Makefile.conf
@@ -1047,6 +1066,12 @@ config-gcc-static: clean
echo 'ENABLE_READLINE := 0' >> Makefile.conf
echo 'ENABLE_TCL := 0' >> Makefile.conf

+config-conda-linux: clean
+ echo 'CONFIG := conda-linux' > Makefile.conf
+
+config-conda-mac: clean
+ echo 'CONFIG := conda-mac' > Makefile.conf
+
config-sudo:
echo "INSTALL_SUDO := sudo" >> Makefile.conf
config-afl-gcc: clean
echo 'CONFIG := afl-gcc' > Makefile.conf

@@ -1119,4 +1144,4 @@ echo-abc-rev:
-include techlibs/*/*.d
@@ -1111,3 +1136,4 @@ echo-abc-rev:

.PHONY: all top-all abc test install install-abc docs clean mrproper qtcreator coverage vcxsrc mxebin
-.PHONY: config-clean config-clang config-gcc config-gcc-static config-gcc-4.8 config-afl-gcc config-gprof config-sudo
+.PHONY: config-clean config-clang config-gcc config-gcc-static config-gcc-4.8 config-afl-gcc config-gprof config-sudo config-conda-linux config-conda-mac
.PHONY: config-clean config-clang config-gcc config-gcc-static config-afl-gcc config-gprof config-sudo
+.PHONY: config-gprof config-conda-linux config-conda-mac config-sudo