Merge branch 'dev' into add_kernel_range_spinlock

Author: William-An

.github/workflows/weekly.yml

@@ -53,7 +53,7 @@ jobs:
           source ./gpu-app-collection/src/setup_environment
           rm -rf ./hw_run/
           ./util/tracer_nvbit/run_hw_trace.py -B rodinia_2.0-ft,rodinia-3.1,GPU_Microbenchmark -D 7
-          ./util/tracer_nvbit/run_hw.py -B rodinia_2.0-ft,rodinia-3.1,GPU_Microbenchmark -D 7
+          ./util/hw_stats/run_hw.py -B rodinia_2.0-ft,rodinia-3.1,GPU_Microbenchmark -D 7
           rm -rf /scratch/tgrogers-disk01/a/common/for-sharing/$USER/nightly-traces
           mkdir -p /scratch/tgrogers-disk01/a/common/for-sharing/$USER/nightly-traces
           mv ./hw_run /scratch/tgrogers-disk01/a/common/for-sharing/$USER/nightly-traces/hw_run

util/job_launching/procman.py

@@ -197,7 +197,7 @@ def killJobs(self):
                 continue
             for child in p.children(recursive=True):
                 os.kill(child.pid, 9)
-        os.kill(activeJob.procId, 9)
+            os.kill(activeJob.procId, 9)
 
     def tick(self):
         if self.tickingProcess == None: