reduce survey variable set; add wrapper command

hpc · Feb 26, 2024 · 041ba1b · 041ba1b
1 parent 364e98c
commit 041ba1b
Showing 1 changed file with 17 additions and 24 deletions.
diff --git a/builtins/survey.yaml b/builtins/survey.yaml
@@ -1,6 +1,9 @@
 variables:
     survey?:
-        counters: []
+        counters: [PAPI_TOT_CYC, PAPI_TOT_INS, PAPI_LD_INS, PAPI_VEC_DP,
+            PAPI_DP_OPS, PAPI_FDV_OPS, PAPI_FP_INS, PAPI_FP_OPS, PAPI_L3_TCM,
+            PAPI_L2_TCM, PAPI_L1_TCM, PAPI_TLB_IM, PAPI_REF_CYC, PAPI_REF_NS,
+            PAPI_FUL_CCY, PAPI_RES_STL, PAPI_TLB_DM, PAPI_TLB_TL]
         disable-papi-multiplex: False
         disable-papi: False
         disable-io: False
@@ -11,28 +14,18 @@ variables:
         enable-kokkos: False
         enable-mem: False
         enable-mem-gotcha: False
-        top-down: False
-        top-down-fe: False
-        top-down-bs: False
-        top-down-be: False
-        top-down-ret: False
-        top-down-mem-bound: False
-        top-down-core-bound: False
-        info: null
-        csv-only: False
-        json-only: False
-        debug_collector: False
-        debug_monitor: False
-        no-collector: False
-        no-analysis: False
-        block-report: False
-        output-to-file: False
-        prefix: null
-        project: null
-        version: False
-        config: null
-        tag: null
-        timestamp: False
 
     schedule:
-        wrapper: 'survey -counters {{counters}}'
+        wrapper: >-
+            survey --counters [~{{counters}}~,] 
+            {{ flag(survey.disable-papi-multiplex, "--disable-papi-multiplex") }} 
+            {{ flag(survey.disable-papi, "--disable-papi") }} 
+            {{ flag(survey.disable-io, "--disable-io") }} 
+            {{ flag(survey.disable-mpi, "--disable-mpi") }} 
+            {{ flag(survey.disable-ompt, "--disable-ompt") }} 
+            {{ flag(survey.disable-kokkos, "--disable-kokkos") }} 
+            {{ flag(survey.use-survey-omp-rt "--user-survey-omp-rt") }} 
+            {{ flag(survey.enable-kokkos, "--enable-kokkos") }} 
+            {{ flag(survey.enable-mem, "--enable-mem") }} 
+            {{ flag(survey.enable-mem-gotcha, "--enable-mem") }} 
+            --json-only