From 4319a1d712b57f391ef69c2fbe3d2cd77657e8e3 Mon Sep 17 00:00:00 2001 From: Fangjia Shen Date: Tue, 19 Mar 2024 18:46:35 -0400 Subject: [PATCH 1/3] both std::cin and stdout need to be cleared from error state --- gpu-simulator/trace-parser/trace_parser.cc | 1 + .../tracer_tool/traces-processing/post-traces-processing.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/gpu-simulator/trace-parser/trace_parser.cc b/gpu-simulator/trace-parser/trace_parser.cc index c126ad38e..68cfb235d 100644 --- a/gpu-simulator/trace-parser/trace_parser.cc +++ b/gpu-simulator/trace-parser/trace_parser.cc @@ -343,6 +343,7 @@ kernel_trace_t *trace_parser::parse_kernel_info( // Important to clear the istream. Otherwise, the eofbit from the last // kernel may be carried over to this kernel ifs->clear(); + clearerr(stdin); while (!ifs->eof()) { getline(*ifs, line); diff --git a/util/tracer_nvbit/tracer_tool/traces-processing/post-traces-processing.cpp b/util/tracer_nvbit/tracer_tool/traces-processing/post-traces-processing.cpp index 935dd55e9..44ce104d8 100644 --- a/util/tracer_nvbit/tracer_tool/traces-processing/post-traces-processing.cpp +++ b/util/tracer_nvbit/tracer_tool/traces-processing/post-traces-processing.cpp @@ -271,6 +271,7 @@ void group_per_block(const char *filepath) { // Important... without clear(), cin.eof() may evaluate to true on the second // kernel cin.clear(); + clearerr(stdin); while (!cin.eof()) { getline(cin, line); From a7a0fb7e6a096876961ae7bcd1c10db0b0aff5d6 Mon Sep 17 00:00:00 2001 From: Fangjia Shen Date: Tue, 19 Mar 2024 18:49:44 -0400 Subject: [PATCH 2/3] tracer: change arch to 70 --- util/tracer_nvbit/tracer_tool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/tracer_nvbit/tracer_tool/Makefile b/util/tracer_nvbit/tracer_tool/Makefile index c50080eab..696e244ec 100644 --- a/util/tracer_nvbit/tracer_tool/Makefile +++ b/util/tracer_nvbit/tracer_tool/Makefile @@ -17,7 +17,7 @@ NVCC_PATH=-L $(subst bin/nvcc,lib64,$(shell which nvcc | tr -s /)) SOURCES=$(wildcard *.cu) OBJECTS=$(SOURCES:.cu=.o) -ARCH=35 +ARCH=70 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path)))) From 6f2a38293434e7bf6584ac8aecfbb47dcfa08d68 Mon Sep 17 00:00:00 2001 From: JRPan <25518778+JRPan@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:16:22 -0400 Subject: [PATCH 3/3] Use CUDA 11.7 --- .github/workflows/long-tests.yml | 12 ++++++------ .github/workflows/tracer-tool.yml | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/long-tests.yml b/.github/workflows/long-tests.yml index 68a037ede..9c770899b 100644 --- a/.github/workflows/long-tests.yml +++ b/.github/workflows/long-tests.yml @@ -29,14 +29,14 @@ 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 @@ -44,7 +44,7 @@ jobs: ./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 git@github.com:accel-sim/statistics-archive.git # either create a new branch or check it out if it already exists @@ -65,7 +65,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.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 @@ -90,14 +90,14 @@ 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 diff --git a/.github/workflows/tracer-tool.yml b/.github/workflows/tracer-tool.yml index d120e7ae8..1563529cc 100644 --- a/.github/workflows/tracer-tool.yml +++ b/.github/workflows/tracer-tool.yml @@ -29,14 +29,14 @@ jobs: git checkout cluster-ubuntu - name: Build Accel-Sim run: | - source ./env-setup/11.0_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 make -j -C gpu-simulator - name: test-prebuilt-traces run: | - source ./env-setup/11.0_env_setup.sh + 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 - @@ -46,13 +46,13 @@ jobs: rm -rf sim_run_11.0 - name: Build Tracer run: | - source ./env-setup/11.0_env_setup.sh + 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.0_env_setup.sh + source ./env-setup/11.7.0_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 @@ -60,18 +60,18 @@ jobs: make -C ./gpu-app-collection/src rodinia_2.0-ft - name: generate-rodinia_2.0-ft-traces run: | - source ./env-setup/11.0_env_setup.sh + 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.0_env_setup.sh + 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.0_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 -C QV100-SASS -T ./hw_run/traces/device-7/11.0/ -N rodinia_2.0-ft-$$ + ./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-$$ \ No newline at end of file