From fa948cce3867f75bdfcfbe854437e35b74a160a2 Mon Sep 17 00:00:00 2001
From: Weili An <an107@purdue.edu>
Date: Sat, 24 Aug 2024 10:47:19 -0400
Subject: [PATCH] sst-integration: putting all together

---
 Dockerfile | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 78f1f60..93881ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,28 +12,28 @@ ENV LLVM_INSTALL_PATH /accel-sim/llvm-install
 ENV RISCV_TOOLCHAIN_INSTALL_PATH /accel-sim/riscv-gnu-install
 
 # Build LLVM 18.1.8
-# RUN git clone https://github.com/llvm/llvm-project.git \
-# && mkdir llvm-install \
-# && cd llvm-project \
-# && git checkout llvmorg-18.1.8 \
-# && mkdir build && cd build \
-# && cmake -DLLVM_TARGETS_TO_BUILD="RISCV;X86;NVPTX" -DLLVM_DEFAULT_TARGET_TRIPLE=riscv64-unknown-linux-gnu \
-#          -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;lld" -DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_PATH ../llvm \
-# && cmake --build . -j4 \
-# && cmake --build . --target install \
-# && cd .. && cd .. \
-# && rm -rf llvm-project
+RUN git clone https://github.com/llvm/llvm-project.git \
+&& mkdir llvm-install \
+&& cd llvm-project \
+&& git checkout llvmorg-18.1.8 \
+&& mkdir build && cd build \
+&& cmake -DLLVM_TARGETS_TO_BUILD="RISCV;X86;NVPTX" -DLLVM_DEFAULT_TARGET_TRIPLE=riscv64-unknown-linux-gnu \
+         -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;lld" -DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_PATH ../llvm \
+&& cmake --build . -j4 \
+&& cmake --build . --target install \
+&& cd .. && cd .. \
+&& rm -rf llvm-project
 
 # Build RISCV GNU Toolchain 2024.08.06.nightly
-# RUN apt-get update && apt-get -y install autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev ninja-build git cmake libglib2.0-dev libslirp-dev
-# RUN git clone https://github.com/riscv-collab/riscv-gnu-toolchain.git \
-# && mkdir riscv-gnu-install \
-# && cd riscv-gnu-toolchain \
-# && git checkout 2024.08.06 \
-# && ./configure --prefix=$RISCV_TOOLCHAIN_INSTALL_PATH \
-# && make linux -j4 \
-# && cd .. \
-# && rm -rf riscv-gnu-toolchain
+RUN apt-get update && apt-get -y install autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev ninja-build git cmake libglib2.0-dev libslirp-dev
+RUN git clone https://github.com/riscv-collab/riscv-gnu-toolchain.git \
+&& mkdir riscv-gnu-install \
+&& cd riscv-gnu-toolchain \
+&& git checkout 2024.08.06 \
+&& ./configure --prefix=$RISCV_TOOLCHAIN_INSTALL_PATH \
+&& make linux -j4 \
+&& cd .. \
+&& rm -rf riscv-gnu-toolchain
 
 # Setup GPU app collection in SST mode
 RUN export PATH=$CUDA_INSTALL_PATH/bin:$PATH \