Merge branch 'dev' into cuda_api_tracer

Author: William-An

.github/workflows/long-tests.yml

@@ -31,22 +31,22 @@ jobs:
           git checkout cluster-ubuntu
       - name: Build Accel-Sim
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           rm -rf ./gpu-simulator/gpgpu-sim
           source ./gpu-simulator/setup_environment.sh
           make clean -C gpu-simulator
           srun -c20 make -j20 -C gpu-simulator
       - name: Run SASS
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           source ./gpu-simulator/setup_environment.sh
           ./util/job_launching/run_simulations.py -B rodinia_2.0-ft,GPU_Microbenchmark -C QV100-SASS -T ~/../common/accel-sim/traces/volta-tesla-v100/latest/ -N sass-short-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
           ./util/job_launching/run_simulations.py -B rodinia_2.0-ft,GPU_Microbenchmark -C RTX2060-SASS -T ~/../common/accel-sim/traces/turing-rtx2060/latest/ -N sass-short-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
           ./util/job_launching/run_simulations.py -B rodinia_2.0-ft,GPU_Microbenchmark -C RTX3070-SASS -T ~/../common/accel-sim/traces/ampere-rtx3070/latest/ -N sass-short-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
           ./util/job_launching/monitor_func_test.py -v -s stats-per-app-sass.csv -N sass-short-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
       - name: Archive Stats
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           rm -rf ./statistics-archive
           git clone git@github.com:accel-sim/statistics-archive.git
           # either create a new branch or check it out if it already exists
@@ -75,7 +75,7 @@ jobs:
           git -C ./statistics-archive push -u origin git_${GITHUB_REF}"_"$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
       - name: Correlate Ubench
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           ./util/hw_stats/get_hw_data.sh > /dev/null 2>&1
           rm -rf ./util/plotting/correl-html/
           ./util/plotting/plot-correlation.py -c ./v100-ubench-sass-latest2.csv -H ./hw_run/volta-tesla-v100/11.2/ | tee v100-ubench-correl.txt
@@ -107,14 +107,14 @@ jobs:
           git checkout cluster-ubuntu
       - name: Build Accel-Sim
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           rm -rf ./gpu-simulator/gpgpu-sim
           source ./gpu-simulator/setup_environment.sh
           make clean -C gpu-simulator
           srun -c20 make -j20 -C gpu-simulator
       - name: Run PTX
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           source ./gpu-simulator/setup_environment.sh
 
           rm -rf ./gpu-app-collection
@@ -141,14 +141,14 @@ jobs:
           git checkout cluster-ubuntu
       - name: Build Accel-Sim
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           rm -rf ./gpu-simulator/gpgpu-sim
           source ./gpu-simulator/setup_environment.sh
           make clean -C gpu-simulator
           make -j -C gpu-simulator
       - name: test-prebuilt-traces
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           source ./gpu-simulator/setup_environment.sh
           ./get-accel-sim-traces.py -a tesla-v100/rodinia_2.0-ft
           cd hw_run; tar -xzvf rodinia_2.0-ft.tgz; cd -
@@ -158,32 +158,32 @@ jobs:
           rm -rf sim_run_11.0
       - name: Build Tracer
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           ./util/tracer_nvbit/install_nvbit.sh
           make clean -C ./util/tracer_nvbit/
           make -C ./util/tracer_nvbit/
       - name: rodinia_2.0-ft-build
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           rm -rf ./gpu-app-collection/
           git clone git@github.com:accel-sim/gpu-app-collection.git
           source ./gpu-app-collection/src/setup_environment
           ln -s /home/tgrogers-raid/a/common/data_dirs ./gpu-app-collection/
           make -C ./gpu-app-collection/src rodinia_2.0-ft
       - name: generate-rodinia_2.0-ft-traces
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           source ./gpu-app-collection/src/setup_environment
           rm -rf ./hw_run/
           ./util/tracer_nvbit/run_hw_trace.py -B rodinia_2.0-ft -D 7
       - name: generate-rodinia_2.0-ft-hw_stats
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           source ./gpu-app-collection/src/setup_environment
           ./util/hw_stats/run_hw.py -B rodinia_2.0-ft -D 7
       - name: test-new-traces
         run: |
-          source ./env-setup/11.7.0_env_setup.sh
+          source ./env-setup/12.4_env_setup.sh
           source ./gpu-simulator/setup_environment.sh
           ./util/job_launching/run_simulations.py -B rodinia_2.0-ft -C QV100-SASS -T ./hw_run/traces/device-7/ -N rodinia_2.0-ft-$$
-          ./util/job_launching/monitor_func_test.py -I -v -s rodinia-stats-per-app.csv -N rodinia_2.0-ft-$$
+          ./util/job_launching/monitor_func_test.py -I -v -s rodinia-stats-per-app.csv -N rodinia_2.0-ft-$$

.travis.yml

@@ -10,7 +10,7 @@ Accel-Sim: An Extensible Simulation Framework for Validated GPU Modeling,
 in 2020 ACM/IEEE 47th Annual International Symposium on Computer Architecture (ISCA)
 ```
 
-This repository also includes AccelWattch: A Power Modeling Framework for Modern GPUs. The [MICRO 2021 paper](http://paragon.cs.northwestern.edu/papers/2021-MICRO-AccelWattch-Kandiah.pdf) introduces AccelWattch. Please look at our [AccelWattch MICRO'21 Artifact Manual](https://github.com/accel-sim/accel-sim-framework/blob/release-accelwattch/AccelWattch.md) for detailed information on various AccelWattch components. For information on just running AccelWattch, please look at the [AccelWattch Overview](https://github.com/accel-sim/accel-sim-framework/blob/release-accelwattch/README.md#accelwattch-overview) section in this read-me.
+This repository also includes AccelWattch: A Power Modeling Framework for Modern GPUs. The [MICRO 2021 paper](http://paragon.cs.northwestern.edu/papers/2021-MICRO-AccelWattch-Kandiah.pdf) introduces AccelWattch. Please look at our [AccelWattch MICRO'21 Artifact Manual](https://github.com/accel-sim/accel-sim-framework/blob/release/AccelWattch.md) for detailed information on various AccelWattch components. For information on just running AccelWattch, please look at the [AccelWattch Overview](https://github.com/accel-sim/accel-sim-framework/blob/release/README.md#accelwattch-overview) section in this read-me.
 If you use any component of AccelWattch, please cite:
 
 ```
@@ -23,14 +23,14 @@ in 2021 IEEE/ACM International Symposium on Microarchitecture (MICRO)
 ## Dependencies
 
 This package is meant to be run on a modern linux distro.
-A docker image that works with this repo can be found [here](https://hub.docker.com/repository/docker/accelsim/ubuntu-18.04_cuda-11).
+A docker image that works with this repo can be found [here](ghcr.io/accel-sim/accel-sim-framework:ubuntu-24.04-cuda-12.8).
 There is nothing special here, just Ubuntu 18.04 with the following commands
 run:
 
 ```bash
 sudo apt-get install  -y wget build-essential xutils-dev bison zlib1g-dev flex \
       libglu1-mesa-dev git g++ libssl-dev libxml2-dev libboost-all-dev git g++ \
-      libxml2-dev vim python-setuptools python-dev build-essential python-pip
+      libxml2-dev vim python-setuptools build-essential python3-pip
 
 pip3 install pyyaml plotly psutil
 wget http://developer.download.nvidia.com/compute/cuda/11.0.1/local_installers/cuda_11.0.1_450.36.06_linux.run
@@ -55,7 +55,7 @@ the apps in from this collection as well as just on your own, with your own apps
 
 [GPU App Collection](https://github.com/accel-sim/gpu-app-collection)
 
-AccelWattch microbenchmarks and AccelWattch validation set benchmarks are also included. For more information on these benchmarks, please look at our [MICRO 2021 paper](http://paragon.cs.northwestern.edu/papers/2021-MICRO-AccelWattch-Kandiah.pdf) and [AccelWattch MICRO'21 Artifact Manual](https://github.com/accel-sim/accel-sim-framework/blob/release-accelwattch/AccelWattch.md).
+AccelWattch microbenchmarks and AccelWattch validation set benchmarks are also included. For more information on these benchmarks, please look at our [MICRO 2021 paper](http://paragon.cs.northwestern.edu/papers/2021-MICRO-AccelWattch-Kandiah.pdf) and [AccelWattch MICRO'21 Artifact Manual](https://github.com/accel-sim/accel-sim-framework/blob/release/AccelWattch.md).
 
 ## Accel-Sim Components
 
@@ -249,7 +249,7 @@ apt-get install gdb
 ```
 
 Don't want to install docker?
-Just use a linux ditro with the packages detailed in dependencies, set
+Just use a linux distro with the packages detailed in dependencies, set
 CUDA\_INSTALL\_PATH, the run ./travis.sh.
 
 
@@ -275,7 +275,7 @@ Note that *AccelWattch HW* and *AccelWattch HYBRID* configurations require hardw
 ./util/job_launching/run_simulations.py -B rodinia_2.0-ft -C GV100-Accelwattch_PTX_SIM -N myTest
 ```
 
-4. **Hardware Power and Performance Profiler**: The AccelWattch hardware profiler scripts are located at `./util/accelwattch/accelwattch_hw_profiler/` in this repository. For more information on how to use them, please look at [this](https://github.com/accel-sim/accel-sim-framework/blob/release-accelwattch/AccelWattch.md#hardware-profiling-for-accelwattch-validation) section in our MICRO'21 Artifact Manual.
+4. **Hardware Power and Performance Profiler**: The AccelWattch hardware profiler scripts are located at `./util/accelwattch/accelwattch_hw_profiler/` in this repository. For more information on how to use them, please look at [this](https://github.com/accel-sim/accel-sim-framework/blob/release/AccelWattch.md#hardware-profiling-for-accelwattch-validation) section in our MICRO'21 Artifact Manual.
 
 5. **Microbenchmarks and Quadratic Optimization Solver**: The source code for the microbenchmarks used for AccelWattch dynamic power modeling are located [here](https://github.com/accel-sim/gpu-app-collection/tree/release-accelwattch/src/cuda/accelwattch-ubench) and can be compiled by following the README [here](https://github.com/accel-sim/gpu-app-collection/tree/release-accelwattch). The Quadratic Optimization Solver MATLAB script is located at `./util/accelwattch/quadprog_solver.m`.
 

Jenkinsfile

@@ -1,7 +1,7 @@
 # This bash script formats GPGPU-Sim using clang-format
 THIS_DIR="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
-clang-format -i ${THIS_DIR}/trace-driven/*.h
-clang-format -i ${THIS_DIR}/trace-driven/*.cc
-clang-format -i ${THIS_DIR}/ISA_Def/*.h
-clang-format -i ${THIS_DIR}/trace-parser/*.h
-clang-format -i ${THIS_DIR}/trace-parser/*.cc
+clang-format -i ${THIS_DIR}/trace-driven/*.h --style=file:${THIS_DIR}/.clang-format
+clang-format -i ${THIS_DIR}/trace-driven/*.cc --style=file:${THIS_DIR}/.clang-format
+clang-format -i ${THIS_DIR}/ISA_Def/*.h --style=file:${THIS_DIR}/.clang-format
+clang-format -i ${THIS_DIR}/trace-parser/*.h --style=file:${THIS_DIR}/.clang-format
+clang-format -i ${THIS_DIR}/trace-parser/*.cc --style=file:${THIS_DIR}/.clang-format

README.md

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020 Timothy Rogers, Purdue University
+# Copyright (c) 2025 Timothy Rogers, Purdue University
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,18 @@ export ACCELSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
 export GPGPUSIM_REPO="${GPGPUSIM_REPO:=https://github.com/accel-sim/gpgpu-sim_distribution.git}"
 export GPGPUSIM_BRANCH="${GPGPUSIM_BRANCH:=dev}"
 
+# Help the user out by setting the default CUDA_INSTALL_PATH, if it is not already set
+if [ -z "$CUDA_INSTALL_PATH" ]; then
+    DEFAULT_CUDA_PATH="/usr/local/cuda"
+    if [ ! -d "$DEFAULT_CUDA_PATH" ]; then
+        echo "Error: Default CUDA installation directory ($DEFAULT_CUDA_PATH) does not exist."
+        echo "Please set CUDA_INSTALL_PATH to your CUDA installation directory."
+        return 1
+    fi
+    echo "CUDA_INSTALL_PATH is not set, setting it to $DEFAULT_CUDA_PATH"
+    export CUDA_INSTALL_PATH=$DEFAULT_CUDA_PATH
+fi
+
 if [ $# = '1' ] ;
 then
     export ACCELSIM_CONFIG=$1

gpu-simulator/format-code.sh

@@ -1,11 +1,11 @@
 // developed by Mahmoud Khairy, Purdue Univ
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
 #include <vector>
-#include <stdint.h>
 #ifndef TRACE_PARSER_H
 #define TRACE_PARSER_H