From 68af3f45c94546ca9e2886633bd10c1ae7b64d03 Mon Sep 17 00:00:00 2001
From: Kaustav Goswami <39310478+kaustav-goswami@users.noreply.github.com>
Date: Fri, 13 Oct 2023 14:31:35 -0700
Subject: [PATCH] tests: updated the nightly tests to use SST 13.0.0 (#441)

PR https://github.com/gem5/gem5/pull/396 updates the gem5 SST bridge to
use StandardMem in SST. This change updates the nightly tests to use SST
13.0.0 instead of SST 11.1.0. It also updates the dockerfile.

Change-Id: I5c109c40379d2f09601a1c9f19c51dd716c6582e

---------

Signed-off-by: Kaustav Goswami <kggoswami@ucdavis.edu>
Co-authored-by: Bobby R. Bruce <bbruce@ucdavis.edu>
---
 .github/workflows/daily-tests.yaml              |  3 +++
 tests/deprecated/nightly.sh                     |  3 ++-
 util/dockerfiles/docker-compose.yaml            |  2 +-
 util/dockerfiles/{sst-11.1.0 => sst}/Dockerfile | 14 +++++++-------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename util/dockerfiles/{sst-11.1.0 => sst}/Dockerfile (89%)

diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml
index 06423d95e4..36006d03e4 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -220,6 +220,9 @@ jobs:
                   ref: develop
             - name: Build RISCV/libgem5_opt.so with SST
               run: scons build/RISCV/libgem5_opt.so --without-tcmalloc --duplicate-sources --ignore-style -j $(nproc)
+            - name: Makefile ext/sst
+              working-directory: ${{ github.workspace }}/ext/sst
+              run: mv Makefile.linux Makefile
             - name: Compile ext/sst
               working-directory: ${{ github.workspace }}/ext/sst
               run: make -j $(nproc)
diff --git a/tests/deprecated/nightly.sh b/tests/deprecated/nightly.sh
index cea1ad0be9..9503cd1f61 100755
--- a/tests/deprecated/nightly.sh
+++ b/tests/deprecated/nightly.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2021 The Regents of the University of California
+# Copyright (c) 2021-2023 The Regents of the University of California
 # All Rights Reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -161,6 +161,7 @@ build_and_run_SST () {
 scons build/${isa}/libgem5_${variant}.so -j${compile_threads} \
 --without-tcmalloc --duplicate-sources --ignore-style && \
 cd ext/sst && \
+mv Makefile.linux Makefile && \
 make clean; make -j ${compile_threads} && \
 sst --add-lib-path=./ sst/example.py && \
 cd -;
diff --git a/util/dockerfiles/docker-compose.yaml b/util/dockerfiles/docker-compose.yaml
index a4f585f6d7..005e415484 100644
--- a/util/dockerfiles/docker-compose.yaml
+++ b/util/dockerfiles/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
         image: gcr.io/gem5-test/gpu-fs:latest
     sst:
         build:
-            context: sst-11.1.0
+            context: sst
             dockerfile: Dockerfile
         image: gcr.io/gem5-test/sst-env:latest
     systemc:
diff --git a/util/dockerfiles/sst-11.1.0/Dockerfile b/util/dockerfiles/sst/Dockerfile
similarity index 89%
rename from util/dockerfiles/sst-11.1.0/Dockerfile
rename to util/dockerfiles/sst/Dockerfile
index 970e6979b4..b392c241fc 100644
--- a/util/dockerfiles/sst-11.1.0/Dockerfile
+++ b/util/dockerfiles/sst/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 The Regents of the University of California
+# Copyright (c) 2021-2023 The Regents of the University of California
 # All Rights Reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -41,9 +41,9 @@ RUN mkdir /sst
 
 # Download and build SST-Core without MPI support
 WORKDIR /sst/
-RUN wget https://github.com/sstsimulator/sst-core/releases/download/v11.1.0_Final/sstcore-11.1.0.tar.gz; \
-    tar xf sstcore-11.1.0.tar.gz;
-WORKDIR /sst/sstcore-11.1.0/
+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;
+WORKDIR /sst/sstcore-13.0.0/
 RUN ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \
                                         --disable-mpi; \
     make all -j $(nproc); \
@@ -51,9 +51,9 @@ RUN ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \
 
 # Download and build SST-Elements
 WORKDIR /sst
-RUN wget https://github.com/sstsimulator/sst-elements/releases/download/v11.1.0_Final/sstelements-11.1.0.tar.gz; \
-    tar xf sstelements-11.1.0.tar.gz;
-WORKDIR /sst/sst-elements-library-11.1.0/
+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;
+WORKDIR /sst/sst-elements-library-13.0.0/
 RUN ./configure --prefix=$SST_CORE_HOME --with-python=/usr/bin/python3-config \
                                         --with-sst-core=$SST_CORE_HOME; \
     make all -j $(nproc); \