From c491e805c9b1e3b0f41abb0cdd8bde51d1ccac2b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 8 Dec 2023 20:45:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=81=D1=87=D0=B5=D1=82=20GP?=
 =?UTF-8?q?U,=20=D0=B8=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  1 -
 .../Passes/All/ExportTasksPackageToExcel.java | 53 ++++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a52dee8b..0e6d8ebb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
index 721851ba..fa883cc9 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -138,15 +138,30 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
         style.setBorderRight(border);
         style.setBorderTop(border);
     }
-    protected String getNumThreads(TestRunTask task) {
-        String environmentsSet = task.environments;
-        return "?";
+    protected String extractEnvironmentValue(String environmentsSet, String name) {
+        if (environmentsSet.contains(name)) {
+            int index = environmentsSet.lastIndexOf(name);
+            if (index >= 0) {
+                String s1 = environmentsSet.substring(index + name.length() + 1);
+                String[] data = s1.split("\"");
+                if (data.length > 0) {
+                    return data[1];
+                }
+            }
+        }
+        return null;
     }
-    protected String getNumCudas(TestRunTask task) {
-        return "?";
-    }
-    protected String getTotalThreads(TestRunTask task) {
-        return "?";
+    protected Integer extractIntegerEnvironmentValue(String environmentsSet, String name) {
+        Integer res = null;
+        String s = extractEnvironmentValue(environmentsSet, name);
+        if (s != null) {
+            try {
+                res = Integer.parseInt(s);
+            } catch (NumberFormatException ex) {
+                ex.printStackTrace();
+            }
+        }
+        return res;
     }
     @Override
     protected void body() throws Exception {
@@ -204,22 +219,32 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                 "Тест",
                 "Язык",
                 "Флаги",
-                "Сборка",
+                "Компиляция",
                 "Запуск",
-                "Матрица",
                 "NUM_THREADS",
                 "NUM_CUDAS",
                 "TOTAL_THREADS",
+                "Матрица",
                 "Окружение",
                 "usr.par",
                 "Время компиляции (с)",
-                "Время выполнения (с)",
+                "Время запуска (с)",
                 "Чистое время (с)",
                 "Прогресс (%)");
         //--
         int i = 1;
         for (TestRunTask task : tasks) {
             ShowMessage2(task.test_description);
+            //---
+            Integer NUM_THREADS = extractIntegerEnvironmentValue(task.environments, "DVMH_NUM_THREADS");
+            if (NUM_THREADS == 0)
+                NUM_THREADS = 1;
+            Integer NUM_CUDAS = extractIntegerEnvironmentValue(task.environments, "DVMH_NUM_CUDAS");
+            //--
+            Object num_threads = (NUM_THREADS != null) ? NUM_THREADS : "undef";
+            Object num_cudas = (NUM_CUDAS != null) ? NUM_CUDAS : "undef";
+            Object total_threads = (NUM_THREADS != null) ? NUM_THREADS * Utils.getMatrixProcessors(task.matrix) : "undef";
+            //--
             Row row = addRow(i, false,
                     task.group_description,
                     task.test_description,
@@ -227,10 +252,10 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                     task.flags,
                     task.compilation_state,
                     task.state,
+                    num_threads,
+                    num_cudas,
+                    total_threads,
                     task.matrix,
-                    getNumThreads(task),
-                    getNumCudas(task),
-                    getTotalThreads(task),
                     task.environments,
                     task.usr_par,
                     task.compilation_time,