Repository navigation
Merge chips-it contributions to pulp cluster #124
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
Changes from all commits
a453ac0
65515e2
7b126cd
ed0f8ec
ae2129d
4a35465
6cdfbf6
758b697
e1a84a9
2d955c0
8995289
1281ff2
c8e8721
2d74d7f
e77a0a1
2121e4f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,8 +47,8 @@ endef | |
| # Nonfree components # | ||
| ###################### | ||
|
|
||
| NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:pulp-restricted/pulp-cluster-nonfree.git | ||
| NONFREE_COMMIT ?= aad59d36bfef6b74f03ffed28903a44cb86b9497 | ||
| NONFREE_REMOTE ?= git@gitlab.chips.it:digitalresearchline/chips-restricted/pulp-cluster-nonfree.git | ||
| NONFREE_COMMIT ?= e0e713be4a9215484e07d6f1244c21352e71a4bd | ||
|
|
||
| nonfree-init: | ||
| git clone $(NONFREE_REMOTE) nonfree | ||
|
|
@@ -84,13 +84,21 @@ sw-clean: | |
| @rm -rf pulp-runtime fault_injection_sim regression_tests | ||
|
|
||
| ## Clone pulp-runtime as SW stack | ||
| PULP_RUNTIME_REMOTE ?= https://github.com/pulp-platform/pulp-runtime.git | ||
| PULP_RUNTIME_COMMIT ?= 3b48b0c6872cc01ba169a2c9c886ebb815d22cdc | ||
| PULP_RUNTIME_REMOTE ?= https://github.com/FondazioneChipsIT/pulp-runtime.git | ||
| PULP_RUNTIME_COMMIT ?= 9bd23d2b2b6b6c74fc26a3ab3402fbebc589dace # branch: chips-it | ||
|
|
||
| pulp-runtime: | ||
| git clone $(PULP_RUNTIME_REMOTE) $@ | ||
| cd $@ && git checkout $(PULP_RUNTIME_COMMIT) | ||
|
|
||
| ### Clone pulp-sdk as SW stack | ||
| PULP_SDK_REMOTE ?= https://github.com/FondazioneChipsIT/pulp-sdk.git | ||
| PULP_SDK_COMMIT ?= 55fedf856aafa0a305c6bcd02b7e62b69bc74246 | ||
|
|
||
| pulp-sdk: | ||
| git clone ${PULP_SDK_REMOTE} $@ | ||
| cd $@ && git checkout ${PULP_SDK_COMMIT} && git submodule update --init --recursive | ||
|
|
||
| ## Clone fault injection scripts | ||
| FAULT_SIM_REMOTE ?= https://github.com/pulp-platform/InjectaFault.git | ||
| FAULT_SIM_COMMIT ?= 84ddcff # branch: rt/rename-var | ||
|
|
@@ -100,8 +108,8 @@ fault_injection_sim: | |
| cd $@ && git checkout $(FAULT_SIM_COMMIT) | ||
|
|
||
| ## Clone regression tests | ||
| REGRESSION_TESTS_REMOTE ?= https://github.com/pulp-platform/regression_tests.git | ||
| REGRESSION_TESTS_COMMIT ?= f173611e3e8f15e7f526d40712135e7ff976f805 # branch: lg/upstream | ||
| REGRESSION_TESTS_REMOTE ?= https://github.com/FondazioneChipsIT/regression_tests.git | ||
| REGRESSION_TESTS_COMMIT ?= a795d6a318c5aa5842e61e2e2daf2d2c6cb89454 # branch: chips-it | ||
|
|
||
| regression_tests: | ||
| git clone $(REGRESSION_TESTS_REMOTE) $@ | ||
|
|
@@ -141,21 +149,22 @@ $(library): | |
| $(QUESTA) vlib $(library) | ||
|
|
||
|
|
||
| uv: | ||
| cd $(shell bender path idma) && \ | ||
| curl -LsSf https://astral.sh/uv/install.sh | sh && \ | ||
| uv sync --locked | ||
| idma_venv: | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why rolling back from
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For this I think the reason is that we need to bump iDMA to the latest release first. But I think that should be done in a separate PR. |
||
| python3 -m venv $(VENV) && \ | ||
| $(VENV)/bin/python -m pip install -U pip && \ | ||
| $(VENV)/bin/python -m pip install -r $(shell $(BENDER) path idma)/requirements.txt && \ | ||
| $(VENV)/bin/python -m pip install "setuptools<81" | ||
|
|
||
| generate_idma_rtl: uv | ||
| . "$(shell bender path idma)/.venv/bin/activate" && $(MAKE) -C $(shell bender path idma) idma_hw_all | ||
| generate_idma_rtl: idma_venv | ||
| . "$(VENV)/bin/activate" && $(MAKE) -C $(shell $(BENDER) path idma) idma_hw_all | ||
|
|
||
| compile: $(library) | ||
| @test -f Bender.lock || { echo "ERROR: Bender.lock file does not exist. Did you run make checkout in bender mode?"; exit 1; } | ||
| @test -f scripts/compile.tcl || { echo "ERROR: scripts/compile.tcl file does not exist. Did you run make scripts in bender mode?"; exit 1; } | ||
| $(VSIM) -c -do 'quit -code [source scripts/compile.tcl]' | ||
|
|
||
| build_qone: compile | ||
| $(QOPT) $(compile_flag) -debug +designfile -suppress 3053 -suppress 8885 -work $(library) $(top_level)_tb -o $(top_level)_tb_optimized | ||
| $(QOPT) $(compile_flag) -debug +designfile -access=rw+/$(top_level)_tb. -suppress 3053 -suppress 8885 -work $(library) $(top_level)_tb -o $(top_level)_tb_optimized | ||
|
|
||
|
|
||
| build: compile | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it willing? shouldn't the pulp_runtime contrib also be merged?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point, the fact is that we're dropping the pulp-runtime support in favor of the pulp-sdk (which now supports the standalone pulp cluster as well on this PR: pulp-platform/pulp-sdk#171).
So actually I'd be for removing the references to pulp-runtime, which anyway is no longer being supported by us.