From abcb9a4b2e9e19bbb34a13e6f41229acee1591d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantin=20F=C3=BCrst?= Date: Thu, 25 Jan 2024 15:13:55 +0100 Subject: [PATCH] extend modestring to contain query type --- qdp_project/src/Benchmark.cpp | 2 +- qdp_project/src/BenchmarkModes.hpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qdp_project/src/Benchmark.cpp b/qdp_project/src/Benchmark.cpp index 2445155..74f9d56 100644 --- a/qdp_project/src/Benchmark.cpp +++ b/qdp_project/src/Benchmark.cpp @@ -274,7 +274,7 @@ int main() { const int current_node = numa_node_of_cpu(current_cpu); const int cache_node = CachePlacementPolicy(current_node, current_node, 0); - const std::string ofname = "results/qdp-xeonmax-simpleq-" + std::string(MODE_STRING) + "-tca" + std::to_string(TC_SCANA) + "-tcb" + std::to_string(TC_SCANB) + "-tcj" + std::to_string(TC_AGGRJ) + "-tmul" + std::to_string(GROUP_COUNT) + "-wl" + std::to_string(WL_SIZE_B) + "-cs" + std::to_string(CHUNK_SIZE_B) + ".csv"; + const std::string ofname = "results/qdp-xeonmax-" + std::string(MODE_STRING) + "-tca" + std::to_string(TC_SCANA) + "-tcb" + std::to_string(TC_SCANB) + "-tcj" + std::to_string(TC_AGGRJ) + "-tmul" + std::to_string(GROUP_COUNT) + "-wl" + std::to_string(WL_SIZE_B) + "-cs" + std::to_string(CHUNK_SIZE_B) + ".csv"; std::ofstream fout(ofname); fout << "run;rt-ns;rt-s;result[0];scana-run;scana-wait;scanb-run;scanb-wait;aggrj-run;aggrj-wait;cache-hr;" << std::endl; diff --git a/qdp_project/src/BenchmarkModes.hpp b/qdp_project/src/BenchmarkModes.hpp index 3d9f842..b2abc93 100644 --- a/qdp_project/src/BenchmarkModes.hpp +++ b/qdp_project/src/BenchmarkModes.hpp @@ -12,7 +12,7 @@ constexpr uint32_t TC_SCANB = 1; constexpr uint32_t TC_AGGRJ = 2; constexpr bool PERFORM_CACHING = true; constexpr bool STORE_B_IN_HBM = false; -constexpr char MODE_STRING[] = "prefetch"; +constexpr char MODE_STRING[] = "simple-prefetch"; constexpr bool COMPLEX_QUERY = false; #endif #ifdef MODE_SIMPLE_DRAM @@ -23,7 +23,7 @@ constexpr uint32_t TC_SCANB = 0; constexpr uint32_t TC_AGGRJ = 1; constexpr bool PERFORM_CACHING = false; constexpr bool STORE_B_IN_HBM = false; -constexpr char MODE_STRING[] = "dram"; +constexpr char MODE_STRING[] = "simple-dram"; constexpr bool COMPLEX_QUERY = false; #endif #ifdef MODE_SIMPLE_HBM @@ -34,7 +34,7 @@ constexpr uint32_t TC_SCANB = 0; constexpr uint32_t TC_AGGRJ = 1; constexpr bool PERFORM_CACHING = false; constexpr bool STORE_B_IN_HBM = true; -constexpr char MODE_STRING[] = "hbm"; +constexpr char MODE_STRING[] = "simple-hbm"; constexpr bool COMPLEX_QUERY = false; #endif #ifdef MODE_COMPLEX_PREFETCH @@ -45,7 +45,7 @@ constexpr uint32_t TC_SCANB = 1; constexpr uint32_t TC_AGGRJ = 2; constexpr bool PERFORM_CACHING = true; constexpr bool STORE_B_IN_HBM = false; -constexpr char MODE_STRING[] = "prefetch"; +constexpr char MODE_STRING[] = "complex-prefetch"; constexpr bool COMPLEX_QUERY = true; #endif #ifdef MODE_COMPLEX_DRAM @@ -56,7 +56,7 @@ constexpr uint32_t TC_SCANB = 1; constexpr uint32_t TC_AGGRJ = 2; constexpr bool PERFORM_CACHING = false; constexpr bool STORE_B_IN_HBM = false; -constexpr char MODE_STRING[] = "dram"; +constexpr char MODE_STRING[] = "complex-dram"; constexpr bool COMPLEX_QUERY = true; #endif #ifdef MODE_COMPLEX_HBM @@ -67,6 +67,6 @@ constexpr uint32_t TC_SCANB = 1; constexpr uint32_t TC_AGGRJ = 2; constexpr bool PERFORM_CACHING = false; constexpr bool STORE_B_IN_HBM = true; -constexpr char MODE_STRING[] = "hbm"; +constexpr char MODE_STRING[] = "complex-hbm"; constexpr bool COMPLEX_QUERY = true; #endif