diff --git a/examples/root/lhcb_analysis/lhcb.cpp b/examples/root/lhcb_analysis/lhcb.cpp index 64bacaf1ce..a7e4b37af0 100644 --- a/examples/root/lhcb_analysis/lhcb.cpp +++ b/examples/root/lhcb_analysis/lhcb.cpp @@ -30,7 +30,9 @@ namespace { constexpr auto analysisRepetitions = 100; - constexpr auto analysisRepetitionsInstrumentation = 1; // costly, so run less often + constexpr auto analysisRepetitionsInstrumentation + = 0; // costly, so turned off by default, use 1 for FieldAccessCounts and Heatmap + constexpr auto estimateLoadedCachelines = false; // clang-format off // struct BFlightDistance{}; @@ -467,6 +469,11 @@ namespace template void testAnalysis(std::string_view inputFile, std::string_view treeName, const std::string& mappingName) { + const auto repetitions = llama::mapping::isFieldAccessCount || llama::mapping::isHeatmap + ? analysisRepetitionsInstrumentation + : analysisRepetitions; + if(repetitions == 0) + return; saveLayout(mappingName + ".svg"); auto [view, conversionTime] = convertRNTupleToLLAMA(inputFile, treeName); @@ -486,9 +493,6 @@ namespace sortTime = sortView(view); TH1D hist{}; - const auto repetitions = llama::mapping::isFieldAccessCount || llama::mapping::isHeatmap - ? analysisRepetitionsInstrumentation - : analysisRepetitions; std::chrono::microseconds totalAnalysisTime{}; for(int i = 0; i < repetitions; i++) { @@ -504,8 +508,8 @@ namespace saveHist(hist, mappingName); std::size_t cachlinesLoaded = 0; if constexpr( - !llama::mapping::isHeatmap && !llama::mapping::isFieldAccessCount - && !llama::hasAnyComputedField) + estimateLoadedCachelines && !llama::mapping::isHeatmap + && !llama::mapping::isFieldAccessCount && !llama::hasAnyComputedField) { // measure cachelines auto view2 = llama::allocView(llama::mapping::Heatmap{view.mapping()}); @@ -587,15 +591,15 @@ auto main(int argc, const char* argv[]) -> int testAnalysis(inputFile, treeName, "Custom4"); testAnalysis(inputFile, treeName, "Custom4_HM"); testAnalysis(inputFile, treeName, "Custom5"); - testAnalysis(inputFile, treeName, "Custom5_S"); + // testAnalysis(inputFile, treeName, "Custom5_S"); testAnalysis>(inputFile, treeName, "Custom6"); - testAnalysis, true>(inputFile, treeName, "Custom6_S"); + // testAnalysis, true>(inputFile, treeName, "Custom6_S"); testAnalysis(inputFile, treeName, "Custom7"); - testAnalysis(inputFile, treeName, "Custom7_S"); + // testAnalysis(inputFile, treeName, "Custom7_S"); testAnalysis>(inputFile, treeName, "Custom8"); - testAnalysis, true>(inputFile, treeName, "Custom8_S"); + // testAnalysis, true>(inputFile, treeName, "Custom8_S"); testAnalysis(inputFile, treeName, "Custom9"); - testAnalysis(inputFile, treeName, "Custom9_S"); + // testAnalysis(inputFile, treeName, "Custom9_S"); testAnalysis(inputFile, treeName, "Custom1_3_F"); constexpr auto fullExp = 11;