Merge branch 'dev' into fix_cache_string

William-An · Sep 4, 2024 · 36ee7a8 · 36ee7a8
2 parents 1a4420f + f783a4c
commit 36ee7a8
Show file tree

Hide file tree

Showing 37 changed files with 1,064 additions and 626 deletions.
diff --git a/.github/workflows/long-tests.yml b/.github/workflows/long-tests.yml
@@ -6,7 +6,9 @@ name: Long Tests
 on:
   # Triggers the workflow on push or pull request events but only for the mydev branch
   push:
-  pull_request:
+    branches-ignore:
+      - "gh-readonly-queue**"
+  merge_group:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -20,7 +22,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup Environment
         run: |
           rm -rf env-setup
@@ -29,22 +31,22 @@ jobs:
           git checkout cluster-ubuntu
       - name: Build Accel-Sim
         run: |
-          source ./env-setup/11.2.1_env_setup.sh
+          source ./env-setup/11.7.0_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.2.1_env_setup.sh
+          source ./env-setup/11.7.0_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.2.1_env_setup.sh
+          source ./env-setup/11.7.0_env_setup.sh
           rm -rf ./statistics-archive
           git clone [email protected]:accel-sim/statistics-archive.git
           # either create a new branch or check it out if it already exists
@@ -65,23 +67,30 @@ 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.2.1_env_setup.sh
+          source ./env-setup/11.7.0_env_setup.sh
           ./util/hw_stats/get_hw_data.sh > /dev/null
           rm -rf ./util/plotting/correl-html/
           ./util/plotting/plot-correlation.py -c ./statistics-archive/ubench/v100-ubench-sass.csv -H ./hw_run/QUADRO-V100/device-0/10.2/ | tee v100-ubench-correl.txt
           ./util/plotting/plot-correlation.py -c ./statistics-archive/ubench/turing-ubench-sass.csv -H ./hw_run/TURING-RTX2060/10.2/ | tee turing-ubench-correl.txt
           ./util/plotting/plot-correlation.py -c ./statistics-archive/ubench/ampere-ubench-sass.csv -H ./hw_run/AMPERE-RTX3070/11.2/ | tee ampere-ubench-correl.txt
           ssh ghci@tgrogers-pc01 mkdir -p /home/ghci/accel-sim/correl/git_${GITHUB_REF}"_"$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT/
           rsync --delete -r ./util/plotting/correl-html/ ghci@tgrogers-pc01:/home/ghci/accel-sim/correl/git_${GITHUB_REF}"_"$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT/
-          echo "Correlation Report at: https://tgrogers-pc01.ecn.purdue.edu/github-ci/accel-sim/correl/git_${GITHUB_REF}"_"$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT/"
+          BODY="Github CI - Build $GITHUB_REF SUCCESS.
+          Action link: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          Branch/PR Name: $GITHUB_REF_NAME
+          Correlation Report at: https://tgrogers-pc01.ecn.purdue.edu/github-ci/accel-sim/correl/git_${GITHUB_REF}"_"$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT/."
+          SUBJECT="Github CI - Build $GITHUB_REF SUCCESS"
+          TO="${{ secrets.GROUP_EMAIL }}"
+          echo "$BODY" | mail -s "$SUBJECT" "$TO"
+          echo "Correlation Report at: https://tgrogers-pc01.ecn.purdue.edu/github-ci/accel-sim/correl/git_${GITHUB_REF}"_"$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT/."
   PTX-Simulation:
     if: github.repository == 'accel-sim/accel-sim-framework'
     runs-on: tgrogers-raid
     defaults:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup Environment
         run: |
           rm -rf env-setup
@@ -90,21 +99,83 @@ jobs:
           git checkout cluster-ubuntu
       - name: Build Accel-Sim
         run: |
-          source ./env-setup/11.2.1_env_setup.sh
+          source ./env-setup/11.7.0_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.2.1_env_setup.sh
+          source ./env-setup/11.7.0_env_setup.sh
           source ./gpu-simulator/setup_environment.sh
 
           rm -rf ./gpu-app-collection
-          git clone [email protected]:accel-sim/gpu-app-collection.git
+          git clone -b dev  [email protected]:accel-sim/gpu-app-collection.git
           source ./gpu-app-collection/src/setup_environment
           srun -c20 make rodinia_2.0-ft GPU_Microbenchmark -j20 -C ./gpu-app-collection/src
           ./gpu-app-collection/get_regression_data.sh
 
           ./util/job_launching/run_simulations.py -B rodinia_2.0-ft,GPU_Microbenchmark -C QV100-PTX,RTX2060-PTX,RTX3070-PTX -N short-ptx-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
-          ./util/job_launching/monitor_func_test.py -v -s stats-per-app-ptx.csv -N short-ptx-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
+          ./util/job_launching/monitor_func_test.py -v -s stats-per-app-ptx.csv -N short-ptx-$GITHUB_RUN_NUMBER"_"$GITHUB_RUN_ATTEMPT
+  Tracer-Tool:
+    if: github.repository == 'accel-sim/accel-sim-framework'
+    runs-on: tgrogers-gpu01
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Environment
+        run: |
+          rm -rf env-setup
+          git clone [email protected]:purdue-aalp/env-setup.git 
+          cd env-setup 
+          git checkout cluster-ubuntu
+      - name: Build Accel-Sim
+        run: |
+          source ./env-setup/11.7.0_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 ./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 -
+          ./util/job_launching/run_simulations.py -B rodinia_2.0-ft -C QV100-SASS -T ./hw_run/ -N rodinia_2.0-ft-online-$$
+          ./util/job_launching/monitor_func_test.py -N rodinia_2.0-ft-online-$$ -v
+          rm -rf hw_run
+          rm -rf sim_run_11.0
+      - name: Build Tracer
+        run: |
+          source ./env-setup/11.7.0_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
+          rm -rf ./gpu-app-collection/
+          git clone [email protected]: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 ./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 ./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 ./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-$$
diff --git a/.github/workflows/short-tests.yml b/.github/workflows/short-tests.yml
@@ -6,14 +6,16 @@ name: Short Tests
 on:
   # Triggers the workflow on push or pull request events but only for the mydev branch
   push:
+    branches-ignore:
+      - "gh-readonly-queue**"
   pull_request:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  short-tests:
+jobs:  
+  SASS-Simulation:
     runs-on: ubuntu-latest
     container:
       image: tgrogers/accel-sim_regress:Ubuntu-22.04-cuda-11.7
@@ -22,6 +24,46 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run Simulation
         run: /bin/bash $GITHUB_WORKSPACE/short-tests.sh
+  PTX-Simulation:
+    runs-on: ubuntu-latest
+      # env:
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v4
+      - name: Run Simulation
+        run: echo "skipped PTX-Simulation. Will perform in merge queue"
+  Tracer-Tool:
+    runs-on: ubuntu-latest
+      # env:
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v4
+      - name: Run Simulation
+        run: echo "skipped Tracer-Simulation. Will perform in merge queue"
+  format-code:
+    if: github.event_name == 'pull_request'
+    runs-on: tgrogers-raid
+    needs: [SASS-Simulation, PTX-Simulation, Tracer-Tool]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+          ssh-key: ''
+
+      - name: Run clang-format
+        run: |
+          git config user.name "purdue-jenkins"
+          git config user.email "[email protected]"
+          git remote set-url origin [email protected]:${{github.event.pull_request.head.repo.full_name}}
+          git remote -v
+          /bin/bash ./gpu-simulator/format-code.sh
+          /bin/bash ./util/tracer_nvbit/tracer_tool/format-code.sh
+          if git status --untracked-files=no | grep -q "nothing to commit"; then echo "No changes to commit."; else git commit -a -m "Automated Format"; git push; fi
diff --git a/.github/workflows/tracer-tool.yml b/.github/workflows/tracer-tool.yml