Alex Richardson has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/70497?usp=email )
Change subject: tests: Add '--duplicate-sources' to libgem5 SST build
......................................................................
tests: Add '--duplicate-sources' to libgem5 SST build
Unfortunately the building of SST (in "ext/sst") depends on generated
header files. Therefore it adds the build directory to the include path.
For this to work the libgem5.so must be build with
"--duplicate-sources".
Change-Id: I5ed26a89c81402d421f5dfa110de7cf758f28694
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70497
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M ext/sst/INSTALL.md
M tests/nightly.sh
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/ext/sst/INSTALL.md b/ext/sst/INSTALL.md
index 1034d7d..91f92eb 100644
--- a/ext/sst/INSTALL.md
+++ b/ext/sst/INSTALL.md
@@ -61,9 +61,12 @@
At the root of gem5 folder,
```sh
-scons build/RISCV/libgem5_opt.so -j $(nproc) --without-tcmalloc
+scons build/RISCV/libgem5_opt.so -j $(nproc) --without-tcmalloc
--duplicate-sources
```
+**Note:** `--without-tcmalloc` is required to avoid a conflict with SST's
malloc.
+`--duplicate-sources` is required as the compilation of SST depends on
sources to be present in the "build" directory.
+
### Compiling the SST integration
At the root of gem5 folder,
diff --git a/tests/nightly.sh b/tests/nightly.sh
index f5f9295..9286c54 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -159,7 +159,7 @@
"${gem5_root}" --rm --memory="${docker_mem_limit}" \
gcr.io/gem5-test/sst-env:${tag} bash -c "\
scons build/${isa}/libgem5_${variant}.so -j${compile_threads} \
---without-tcmalloc --ignore-style && \
+--without-tcmalloc --duplicate-sources --ignore-style && \
cd ext/sst && \
make clean; make -j ${compile_threads} && \
sst --add-lib-path=./ sst/example.py && \
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/70497?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5ed26a89c81402d421f5dfa110de7cf758f28694
Gerrit-Change-Number: 70497
Gerrit-PatchSet: 3
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Alex Richardson <alexrichard...@google.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
