functional diagnostics added to remplates

Author: yury-intel

src/plugins/intel_cpu/tools/commit_slider/utils/cfg_manager.py

@@ -22,10 +22,14 @@ def applyTemplate(self):
         logPath = self.cfg["logPath"]
         tmplName = self.cfg["template"]["name"]
         fullCfg = {}
+
+        # todo: generalize tmplcfg generator
         if tmplName == "bm_simple":
             fullCfg = self.generatebmSimpleTemplate()
         elif tmplName == "e2e":
             fullCfg = self.generateE2ETemplate()
+        elif tmplName == "bm_functional":
+            fullCfg = self.generatebmFunctionalTemplate()
         else:
             raise Exception(
                 "Unknown template '{}'".format(tmplName)
@@ -53,7 +57,7 @@ def generatebmSimpleTemplate(self):
             tmpJSON["runConfig"][devParam] = tmpl[devParam]
         return tmpJSON
 
-def generateE2ETemplate(self):
+    def generateE2ETemplate(self):
         tmpl = self.cfg["template"]
         tmpJSON = self.readJsonTmpl("e2e_for_CI.json")
 
@@ -77,3 +81,17 @@ def generateE2ETemplate(self):
         tmpJSON["cachedPathConfig"]["subPath"] = subPath
 
         return tmpJSON
+
+    def generatebmFunctionalTemplate(self):
+        tmpl = self.cfg["template"]
+        tmpJSON = self.readJsonTmpl("bm_output.json")
+        stopPattern = "stopPattern"
+        if "appCmd" in tmpl:
+            tmpJSON["appCmd"] = tmpl["appCmd"]
+        else:
+            raise("No 'appcmd' in template")
+        if stopPattern in tmpl:
+            tmpJSON["runConfig"][stopPattern] = tmpl[stopPattern]
+        else:
+            raise("No 'stopPattern' in template")
+        return tmpJSON

src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_output.json

@@ -1,12 +1,13 @@
 {
-    "appCmd" : "./benchmark_app -m <model_path> -d CPU -t 10",
+    "appCmd" : "{appCmd}",
     "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..",
     "runConfig" : {
         "commitList" : {
             "getCommitListCmd" : "git log <start_commit>..<end_commit> --boundary --pretty=\"%h\""
         },
         "mode" : "checkOutput",
         "traversal" : "firstFailedVersion",
-        "stopPattern" : "(.)*<bm_error_message>(.)*"
-    }
+        "stopPattern" : "(.)*{bm_error_message}(.)*"
+    },
+    "extendBuildCommand":true
 }