add all new parameters to the json-representation of ThreadArgs, update task-description.json to be current, add the StatusCodeToString()-fn to its own file

benchmarks/logging-helper.hpp

@@ -5,45 +5,37 @@
 #include "json/single_include/nlohmann/json.hpp"
 
 #include "execute-move.hpp"
-
-inline const std::string StatusCodeToString(const dml::status_code code) {
-    switch(code) {
-        case dml::status_code::ok: return "[ok]";
-        case dml::status_code::false_predicate: return "[false predicate]";
-        case dml::status_code::partial_completion: return "[partial completion]";
-        case dml::status_code::nullptr_error: return "[nullptr error]";
-        case dml::status_code::bad_size: return "[bad size]";
-        case dml::status_code::bad_length: return "[bad length]";
-        case dml::status_code::inconsistent_size: return "[inconsistent size]";
-        case dml::status_code::dualcast_bad_padding: return "[dualcast bad padding]";
-        case dml::status_code::bad_alignment: return "[bad alignment]";
-        case dml::status_code::buffers_overlapping: return "[buffers overlapping]";
-        case dml::status_code::delta_delta_empty: return "[delta delta empty]";
-        case dml::status_code::batch_overflow: return "[batch overflow]";
-        case dml::status_code::execution_failed: return "[execution failed]";
-        case dml::status_code::unsupported_operation: return "[unsupported operation]";
-        case dml::status_code::queue_busy: return "[queue busy]";
-        case dml::status_code::error: return "[unknown error]";
-        case dml::status_code::config_error: return "[config error]";
-        default: return "[unhandled error]";
-    }
-}
+#include "statuscode-tostring.hpp"
 
 inline void to_json(nlohmann::json& j, const ThreadArgs& a) {
-    j = nlohmann::json{
-        {"node", a.numa_node}, {"core", a.core}, {"size", a.size},
-        {"nnode_src", a.nnode_src}, {"nnode_dst", a.nnode_dst},
-        {"time_us", a.duration.count()},
-        {"status", StatusCodeToString(a.status)}
-    };
+    j["task"]["size"] = a.size;
+    j["task"]["iterations"]["desired"] = a.rep_count;
+    j["task"]["iterations"]["actual"] = a.rep_completed;
+    j["task"]["batching"]["enabled"] = a.batch_submit;
+    j["task"]["batching"]["batch_size"] = a.batch_size;
+    j["task"]["batching"]["barrier_after_n_operations"] = a.barrier_after_n_operations;
+    j["affinity"]["cpu_core"] = a.core;
+    j["affinity"]["numa"] = a.numa_node;
+    j["affinity"]["nnode_src"] = a.nnode_src;
+    j["affinity"]["nnode_dst"] = a.nnode_dst;
+    j["time"]["unit"] = "microseconds";
+    j["time"]["summation"] = "average";
+    j["time"]["completion"] = a.complete_duration;
+    j["time"]["submission"] = a.submit_duration;
+    j["time"]["combined"] = a.combined_duration;
+    j["report"]["status"] = StatusCodeToString(a.status);
 }
 
 inline void from_json(const nlohmann::json& j, ThreadArgs& a) {
-    j.at("node").get_to(a.numa_node);
-    j.at("core").get_to(a.core);
-    j.at("size").get_to(a.size);
-    j.at("nnode_src").get_to(a.nnode_src);
-    j.at("nnode_dst").get_to(a.nnode_dst);
+    j["task"]["size"].get_to(a.size);
+    j["task"]["iterations"]["desired"].get_to(a.rep_count);
+    j["task"]["batching"]["enabled"].get_to(a.batch_submit);
+    j["task"]["batching"]["batch_size"].get_to(a.batch_size);
+    j["task"]["batching"]["barrier_after_n_operations"].get_to(a.barrier_after_n_operations);
+    j["affinity"]["numa"].get_to(a.numa_node);
+    j["affinity"]["core"].get_to(a.core);
+    j["affinity"]["nnode_src"].get_to(a.nnode_src);
+    j["affinity"]["nnode_dst"].get_to(a.nnode_dst);
 }
 
 inline void WriteResultLog(const std::vector<ThreadArgs>& args, const std::string& path, std::ostream& os) {

benchmarks/statuscode-tostring.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <dml/dml.hpp>
+
+inline const std::string StatusCodeToString(const dml::status_code code) {
+    switch(code) {
+        case dml::status_code::ok: return "[ok]";
+        case dml::status_code::false_predicate: return "[false predicate]";
+        case dml::status_code::partial_completion: return "[partial completion]";
+        case dml::status_code::nullptr_error: return "[nullptr error]";
+        case dml::status_code::bad_size: return "[bad size]";
+        case dml::status_code::bad_length: return "[bad length]";
+        case dml::status_code::inconsistent_size: return "[inconsistent size]";
+        case dml::status_code::dualcast_bad_padding: return "[dualcast bad padding]";
+        case dml::status_code::bad_alignment: return "[bad alignment]";
+        case dml::status_code::buffers_overlapping: return "[buffers overlapping]";
+        case dml::status_code::delta_delta_empty: return "[delta delta empty]";
+        case dml::status_code::batch_overflow: return "[batch overflow]";
+        case dml::status_code::execution_failed: return "[execution failed]";
+        case dml::status_code::unsupported_operation: return "[unsupported operation]";
+        case dml::status_code::queue_busy: return "[queue busy]";
+        case dml::status_code::error: return "[unknown error]";
+        case dml::status_code::config_error: return "[config error]";
+        default: return "[unhandled error]";
+    }
+}

benchmarks/task-description.json

@@ -3,11 +3,23 @@
   "path" : "sw",
   "list": [
     {
+      "task": {
+        "size": 4096,
+        "iterations": {
+          "desired": 10000
+        },
+        "batching": {
+          "enabled": true,
+          "batch_size": 100,
+          "barrier_after_n_operations": 10
+        }
+      },
+      "affinity": {
+        "numa": 0,
         "core": 0,
-      "nnode_dst": 0,
         "nnode_src": 0,
-      "node": 0,
-      "size": 4096
+        "nnode_dst": 0
+      }
     }
   ]
 }