LBM - benechmark

Autodesk · Oct 6, 2023 · 016b1f6 · 016b1f6
1 parent 906ace5
commit 016b1f6
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/benchmarks/lbm/src/RunCavityTwoPop.cu b/benchmarks/lbm/src/RunCavityTwoPop.cu
@@ -33,14 +33,14 @@ auto run(Config&                             config,
     using Precision = Precision<Storage, Compute>;
     using Lattice = Lattice_;  // D3Q27<Precision>;
 
-    code << "_" << config.deviceType;
+    code << "_" << config.deviceType << "_";
     for (auto const& id : config.devices) {
         code << id;
     }
-    code << "_SS" << config.stencilSemanticCli.getStringOption() << "_";
-    code << "_SF" << config.spaceCurveCli.getStringOption() << "_";
-    code << "_TM" << config.transferModeCli.getStringOption() << "_";
-    code << "_TM" << config.occCli.getStringOption() << "_";
+    code << "_SS" << config.stencilSemanticCli.getStringOption() ;
+    code << "_SF" << config.spaceCurveCli.getStringOption() ;
+    code << "_TM" << config.transferModeCli.getStringOption() ;
+    code << "_Occ" << config.occCli.getStringOption() ;
     code << "__";
     // using PopulationField = typename Grid::template Field<Storage, Lattice::Q>;
 
@@ -175,11 +175,11 @@ auto runFilterComputeType(Config&            config,
                           std::stringstream& testCode)
 {
     if (config.computeTypeStr == "double") {
-        testCode << "_SD";
+        testCode << "_Sdouble";
         return runFilterLattice<Grid, Storage, double>(config, report, testCode);
     }
     if (config.computeTypeStr == "float") {
-        testCode << "_SF";
+        testCode << "_Sfloat";
         return runFilterLattice<Grid, Storage, float>(config, report, testCode);
     }
     NEON_DEV_UNDER_CONSTRUCTION("");
@@ -192,11 +192,11 @@ auto runFilterStoreType(Config&            config,
     -> void
 {
     if (config.storeTypeStr == "double") {
-        testCode << "_CD";
+        testCode << "_Cdouble";
         return runFilterComputeType<Grid, double>(config, report, testCode);
     }
     if (config.storeTypeStr == "float") {
-        testCode << "_CF";
+        testCode << "_Cfloat";
         return runFilterComputeType<Grid, float>(config, report, testCode);
     }
     NEON_DEV_UNDER_CONSTRUCTION("");
@@ -217,7 +217,7 @@ auto run(Config&            config,
     testCode << "_numDevs_" << config.devices.size();
 
     if (config.gridType == "dGrid") {
-        testCode << "_DG";
+        testCode << "_dGrid";
         return details::runFilterStoreType<Neon::dGrid>(config, report, testCode);
     }
     //    if (config.gridType == "eGrid") {
@@ -232,6 +232,7 @@ auto run(Config&            config,
     //    }
     if (config.gridType == "bGrid_4_4_4") {
         if constexpr (!skipTest) {
+            testCode << "_bGrid_4_4_4";
             using Sblock = Neon::domain::details::bGrid::StaticBlock<4, 4, 4>;
             using Grid = Neon::domain::details::bGrid::bGrid<Sblock>;
             return details::runFilterStoreType<Grid>(config, report, testCode);