Use ConfigManager metadata import for cali-annotation-perftest

Author: daboehme

scripts/run-annotation-perftest.sh

@@ -3,7 +3,7 @@
 depth=28
 width=200
 
-EXE=`pwd`/test/cali-annotation-perftest
+EXE=$(pwd)/test/cali-annotation-perftest
 ARGS="-d ${depth} -w ${width}"
 
 # Run Caliper annotation benchmarks. Designed to run on LLNL dane (56 cores/socket)
@@ -12,19 +12,19 @@ for threads in 1 4 56
 do
     # Annotations only, no active measurement config
     OMP_NUM_THREADS=${threads} \
-        ${EXE} ${ARGS} -P spot,perftest.experiment=annotations
+        ${EXE} ${ARGS} -P "spot,metadata(perftest.experiment=annotations)"
 
     # Aggregation (as used in e.g. runtime-report)
     OMP_NUM_THREADS=${threads} \
     CALI_SERVICES_ENABLE=aggregate,event,timestamp \
     CALI_EVENT_ENABLE_SNAPSHOT_INFO=false \
     CALI_TIMER_SNAPSHOT_DURATION=true \
-        ${EXE} ${ARGS} -P spot,perftest.experiment=aggregation
+        ${EXE} ${ARGS} -P "spot,metadata(perftest.experiment=aggregation)"
 
     # Trace w/ snapshot info
     OMP_NUM_THREADS=${threads} \
     CALI_SERVICES_ENABLE=event,trace,timestamp \
-        ${EXE} ${ARGS} -P spot,perftest.experiment=trace
+        ${EXE} ${ARGS} -P "spot,metadata(perftest.experiment=trace)"
 done
 
-mv *.cali /g/g90/boehme3/experiments/caliper/annotation-perftest/
+mv *.cali ${HOME}/experiments/caliper/annotation-perftest/

test/cali-annotation-perftest.cpp

@@ -99,7 +99,7 @@ void make_strings(const Config& cfg)
         }
 }
 
-void record_globals(const Config& cfg, int threads, const cali::ConfigManager::argmap_t& extra_kv)
+void record_globals(const Config& cfg, int threads)
 {
 #ifdef CALIPER_HAVE_ADIAK
     adiak::value("perftest.tree_width", cfg.tree_width);
@@ -118,9 +118,6 @@ void record_globals(const Config& cfg, int threads, const cali::ConfigManager::a
     adiak::clustername();
     adiak::hostname();
 
-    for (auto& p : extra_kv)
-        adiak::value(p.first, p.second);
-
     for (size_t p = 0; cali_perftest_build_metadata[p][0]; ++p)
         adiak::value(cali_perftest_build_metadata[p][0], cali_perftest_build_metadata[p][1]);
 
@@ -180,11 +177,9 @@ int main(int argc, char* argv[])
         return 2;
     }
 
-    cali::ConfigManager::argmap_t extra_kv;
-
     cali::ConfigManager mgr;
     mgr.set_default_parameter("aggregate_across_ranks", "false");
-    mgr.add(args.get("profile", "").c_str(), extra_kv);
+    mgr.add(args.get("profile", "").c_str());
 
     if (mgr.error())
         std::cerr << "Profiling config error: " << mgr.error_msg() << std::endl;
@@ -206,7 +201,7 @@ int main(int argc, char* argv[])
     cfg.channels   = std::max(std::stoi(args.get("channels", "1")), 1);
 
     // set global attributes before other Caliper initialization
-    record_globals(cfg, threads, extra_kv);
+    record_globals(cfg, threads);
 
     make_strings(cfg);