diff --git a/ext/sst/INSTALL.md b/ext/sst/INSTALL.md index ba61996b32..199d5bcb1a 100644 --- a/ext/sst/INSTALL.md +++ b/ext/sst/INSTALL.md @@ -2,7 +2,7 @@ The links to download SST source code are available at . -This guide is using the most recent SST version (13.0.0) as of September 2023. +This guide is using the most recent SST version (14.0.0) as of September 2024. The following guide assumes `$SST_CORE_HOME` as the location where SST will be installed. @@ -11,14 +11,14 @@ installed. ### Downloading the SST-Core Source Code ```sh -wget https://github.com/sstsimulator/sst-core/releases/download/v13.0.0_Final/sstcore-13.0.0.tar.gz -tar xzf sstcore-13.0.0.tar.gz +wget https://github.com/sstsimulator/sst-core/releases/download/v14.0.0_Final/sstcore-14.0.0.tar.gz +tar xzf sstcore-14.0.0.tar.gz ``` ### Installing SST-Core ```sh -cd sstcore-13.0.0 +cd sstcore-14.0.0 ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \ --disable-mpi # optional, used when MPI is not available. make all -j$(nproc) @@ -36,14 +36,14 @@ export PATH=$SST_CORE_HOME/bin:$PATH ### Downloading the SST-Elements Source Code ```sh -wget https://github.com/sstsimulator/sst-elements/releases/download/v13.0.0_Final/sstelements-13.0.0.tar.gz -tar xzf sstelements-13.0.0.tar.gz +wget https://github.com/sstsimulator/sst-elements/releases/download/v14.0.0_Final/sstelements-14.0.0.tar.gz +tar xzf sstelements-14.0.0.tar.gz ``` ### Installing SST-Elements ```sh -cd sst-elements-library-13.0.0 +cd sst-elements-library-14.0.0 ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \ --with-sst-core=$SST_CORE_HOME make all -j$(nproc) diff --git a/ext/sst/Makefile b/ext/sst/Makefile deleted file mode 100644 index 9213d266e9..0000000000 --- a/ext/sst/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -SST_VERSION=SST-11.1.0 # Name of the .pc file in lib/pkgconfig where SST is installed -GEM5_LIB=gem5_opt -ARCH=RISCV -OFLAG=3 - -LDFLAGS=-shared -fno-common ${shell pkg-config ${SST_VERSION} --libs} -L../../build/${ARCH}/ -Wl,-rpath ../../build/${ARCH} -CXXFLAGS=-std=c++17 -g -O${OFLAG} -fPIC ${shell pkg-config ${SST_VERSION} --cflags} ${shell python3-config --includes} -I../../build/${ARCH}/ -I../../ext/pybind11/include/ -I../../build/softfloat/ -I../../ext -CPPFLAGS+=-MMD -MP -SRC=$(wildcard *.cc) - -.PHONY: clean all - -all: libgem5.so - -libgem5.so: $(SRC:%.cc=%.o) - ${CXX} ${CPPFLAGS} ${LDFLAGS} $? -o $@ -l${GEM5_LIB} - --include $(SRC:%.cc=%.d) - -clean: - ${RM} *.[do] libgem5.so diff --git a/ext/sst/Makefile.linux b/ext/sst/Makefile.linux index f44ecd46d9..3a4a26b076 100644 --- a/ext/sst/Makefile.linux +++ b/ext/sst/Makefile.linux @@ -1,4 +1,4 @@ -SST_VERSION=SST-13.0.0 # Name of the .pc file in lib/pkgconfig where SST is installed +SST_VERSION=SST-14.0.0 # Name of the .pc file in lib/pkgconfig where SST is installed GEM5_LIB=gem5_opt ARCH=RISCV OFLAG=3 diff --git a/ext/sst/Makefile.mac b/ext/sst/Makefile.mac index 4a67570a44..35ef7fc1bc 100644 --- a/ext/sst/Makefile.mac +++ b/ext/sst/Makefile.mac @@ -1,4 +1,4 @@ -SST_VERSION=SST-13.0.0 # Name of the .pc file in lib/pkgconfig where SST is installed +SST_VERSION=SST-14.0.0 # Name of the .pc file in lib/pkgconfig where SST is installed GEM5_LIB=gem5_opt ARCH=RISCV OFLAG=3 diff --git a/util/dockerfiles/sst/Dockerfile b/util/dockerfiles/sst/Dockerfile index cba94520ca..b340902983 100644 --- a/util/dockerfiles/sst/Dockerfile +++ b/util/dockerfiles/sst/Dockerfile @@ -50,25 +50,25 @@ RUN mkdir /sst # Download and build SST-Core without MPI support WORKDIR /sst/ -RUN wget https://github.com/sstsimulator/sst-core/releases/download/v13.0.0_Final/sstcore-13.0.0.tar.gz && \ - tar xf sstcore-13.0.0.tar.gz && \ - cd sstcore-13.0.0/ && \ +RUN wget https://github.com/sstsimulator/sst-core/releases/download/v14.0.0_Final/sstcore-14.0.0.tar.gz && \ + tar xf sstcore-14.0.0.tar.gz && \ + cd sstcore-14.0.0/ && \ ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \ --disable-mpi && \ make all -j $(nproc) && \ make install && \ - cd /sst && rm -rf sstcore-13.0.0.tar.gz sstcore-13.0.0 + cd /sst && rm -rf sstcore-14.0.0.tar.gz sstcore-14.0.0 # Download and build SST-Elements WORKDIR /sst -RUN wget https://github.com/sstsimulator/sst-elements/releases/download/v13.0.0_Final/sstelements-13.0.0.tar.gz && \ - tar xf sstelements-13.0.0.tar.gz && \ - cd sst-elements-library-13.0.0 && \ +RUN wget https://github.com/sstsimulator/sst-elements/releases/download/v14.0.0_Final/sstelements-14.0.0.tar.gz && \ + tar xf sstelements-14.0.0.tar.gz && \ + cd sst-elements-library-14.0.0 && \ ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \ --with-sst-core=$SST_CORE_HOME && \ make all -j $(nproc) && \ make install && \ - cd /sst && rm -rf sstelements-13.0.0.tar.gz sst-elements-library-13.0.0 + cd /sst && rm -rf sstelements-14.0.0.tar.gz sst-elements-library-14.0.0 #Setting the environmental variables ENV PATH=$PATH:$SST_CORE_HOME/bin