Merge remote-tracking branch 'upstream/dev' into dev-ci

accel-sim · Mar 21, 2024 · 6d9b07d · 6d9b07d
2 parents 39af596 + 0e21d6d
commit 6d9b07d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/tracer-tool.yml b/.github/workflows/tracer-tool.yml
@@ -34,6 +34,16 @@ jobs:
           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
@@ -63,5 +73,5 @@ jobs:
         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/11.7/ -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-$$
diff --git 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
@@ -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);