From 1b6d53ee9ec1731142b42a62469639afcf0cfa19 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 28 Apr 2026 19:04:32 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=85=D0=BE=D0=B4=20=D0=B8=20=D0=B4=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D0=B2=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               |   9 ++++++++-
 properties                                        |   4 ++--
 .../ComponentsServer/Component/Sapfor/Sapfor.java |   4 +++-
 src/_VisualDVM/Constants.java                     |   2 +-
 src/_VisualDVM/Passes/All/SPF_MergeRegions.java   |   4 ++++
 src/_VisualDVM/Passes/PassCode.java               |   8 +++++++-
 .../SAPFOR/Directives/DirectiveName.java          |   5 ++++-
 .../SAPFOR/Directives/Spec3Directive.java         |   1 +
 .../SAPFOR/Providers/Spec3Provider.java           |   1 +
 src/icons/Transformations/SPF_MergeRegions.png    | Bin 0 -> 946 bytes
 10 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/SPF_MergeRegions.java
 create mode 100644 src/icons/Transformations/SPF_MergeRegions.png

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5ce6980c..281b0348 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_MergeRegions.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_MergeRegions.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/Spec3Directive.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/Spec3Directive.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Providers/Spec3Provider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Providers/Spec3Provider.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 90101942..aa0749e6 100644
--- a/properties
+++ b/properties
@@ -11,8 +11,8 @@
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
   "InstructionPath": "C:\\Users\\misha\\Documents",
   "PerformanceAnalyzerPath": "C:\\Users\\misha\\Documents",
-  "AutoBugReportsLoad": true,
-  "AutoTestsLoad": true,
+  "AutoBugReportsLoad": false,
+  "AutoTestsLoad": false,
   "ConfirmPassesStart": true,
   "ShowPassesDone": true,
   "FocusPassesResult": false,
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index e2c3f9ea..c4236b31 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -102,7 +102,8 @@ public abstract class Sapfor extends OSDComponent {
         return new PassCode[]{
                 PassCode.SPF_ResolveParallelRegionConflicts,
                 PassCode.SPF_InsertDvmhRegions,
-                PassCode.SPF_RemoveDistArraysFromIO
+                PassCode.SPF_RemoveDistArraysFromIO,
+                PassCode.SPF_MergeRegions
         };
     }
     public static PassCode[] getPreparationTransformationsCodes() {
@@ -160,6 +161,7 @@ public abstract class Sapfor extends OSDComponent {
         res.add(PassCode.SPF_ResolveParallelRegionConflicts);//+
         res.add(PassCode.SPF_RemoveDistArraysFromIO);
         res.add(PassCode.SPF_ResolveCommonBlockConflicts);//+
+        res.add(PassCode.SPF_MergeRegions); //+
         //-
         res.add(PassCode.SPF_InsertDvmhRegions);//+
         res.add(PassCode.SPF_SharedMemoryParallelization);//+
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index dea69f02..c79eb2ed 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1267;
+    public static final int version = 1268;
     public static final int planner_version = 27;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/SPF_MergeRegions.java b/src/_VisualDVM/Passes/All/SPF_MergeRegions.java
new file mode 100644
index 00000000..546c65e7
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/SPF_MergeRegions.java
@@ -0,0 +1,4 @@
+package _VisualDVM.Passes.All;
+import _VisualDVM.Passes.Sapfor.SapforTransformation;
+public class SPF_MergeRegions extends SapforTransformation {
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 68974840..926ae983 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -363,12 +363,15 @@ public enum PassCode implements PassCode_ {
     CompareDVMRunTaskToEthalon,
     DropSapforConfigurationEthalon,
     RefreshSapforPackageResults,
-    SPF_MoveOperators
+    SPF_MoveOperators,
+    SPF_MergeRegions
     ;
     //--
     @Override
     public String getDescription() {
         switch (this) {
+            case SPF_MergeRegions:
+                return "Объединение областей";
             case SPF_MoveOperators:
                 return "Оптимальный порядок операторов";
             case SPF_InsertPrivateArrayDirectives:
@@ -963,6 +966,9 @@ public enum PassCode implements PassCode_ {
             case SPF_MoveOperators:
                 name = "MOVE_OPERATORS";
                 break;
+            case SPF_MergeRegions:
+                name = "MERGE_REGIONS";
+                break;
         }
         return p + " " + name;
     }
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java
index 49c8271d..5b8bd8dc 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/DirectiveName.java
@@ -42,7 +42,8 @@ public enum DirectiveName {
     UNROLL,
     PROCESS_PRIVATE,
     COVER,
-    MERGE;
+    MERGE,
+    MERGE_ARRAYS;
     public String getDescription() {
         switch (this) {
             case SPF:
@@ -125,6 +126,8 @@ public enum DirectiveName {
                 return "Клауза, ограничивающая действие директивы на N тесно-вложенных циклов";
             case MERGE:
                 return "Клауза для объединения циклов";
+            case MERGE_ARRAYS:
+                return "Клауза для объединения массивов-копий в областях распараллеливания";
             default:
                 return "?";
         }
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/Spec3Directive.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/Spec3Directive.java
index 54d6287b..b98e19d2 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/Spec3Directive.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/Spec3Directive.java
@@ -12,6 +12,7 @@ public class Spec3Directive extends SpecDirective {
                 && getOwner().nearestGroup.equals(DirectiveName.TRANSFORM)
                 && !getOwner().flags.contains(DirectiveName.NOINLINE)
                 && !getOwner().flags.contains(DirectiveName.MERGE)
+                && !getOwner().flags.contains(DirectiveName.MERGE_ARRAYS)
                 && !getOwner().flags.contains(DirectiveName.FISSION)
                 && !getOwner().flags.contains(DirectiveName.SHRINK)
                 && !getOwner().flags.contains(DirectiveName.EXPAND)
diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Providers/Spec3Provider.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Providers/Spec3Provider.java
index 1ba390b9..70af1f28 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Providers/Spec3Provider.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Providers/Spec3Provider.java
@@ -11,5 +11,6 @@ public class Spec3Provider extends PrefixWordProvider {
         addDirective(new Spec3Directive(this, DirectiveName.EXPAND));
         addDirective(new Spec3Directive(this, DirectiveName.UNROLL));
         addDirective(new Spec3Directive(this, DirectiveName.MERGE));
+        addDirective(new Spec3Directive(this, DirectiveName.MERGE_ARRAYS));
     }
 }
diff --git a/src/icons/Transformations/SPF_MergeRegions.png b/src/icons/Transformations/SPF_MergeRegions.png
new file mode 100644
index 0000000000000000000000000000000000000000..c56dffde8a97ef337b05ec95802cce1ce0287a1d
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XS
z000XS0e@s)kpKVzHfcjcP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-pOwu}Z^G6hP05
zqT*011aWY9lPD;*>R`sCEkzKl)gj5&q@hY_5?)@_euSf22N!q0z{yc?Q2YY_Kym8e
z5Fvwu2%hQO!{u_psMvL<VU%GIYt?Q#()D~f`@{@W0MH4u)NZv70OBN$_`&BZ0^oVm
zt~(9>#(bD64NQRTZj^-}DnS22ry9f<FoS-oLEHhRI%(HHJOHI$?k_+o$o&l{DcAEs
zd;n(8^?Weq05iya1u%7VsR3$9I#Or7Q!T5OWl6i61d%)*WjY#Uaz73el_sjAqb`vD
z2f$*!*ls#<t!i0&>-;mW=gZvQj}U-ZdMsK&I8^7~DvX`q=i<hA84hn@dQ!CAE4bN!
zh3lfNR-wEF_v0_X#!vm|T2EpC001CkNK#Dz0D2_=0Dyx40Qvs_0D$NK08$750ToyP
z06Lcd02go9S|5-A00H(%L_t(|+N{;ji_K9O$MM&l#?RC&u&@&nL-KPJLdlGU)UcR^
zW+{;dJ6R~P8f27YcK!inX(eTh6;Vc-W>S>Q_%+wn%!s-+&#kX-=U(?-p8C}7oag(z
z&-3Hl!=JVj$8bEOUjNDVVF*Q(GJ1y{{}Q-0PF@Z@#bXSIiujJsW&xeJAHfeM_7BJ2
z40bmI=)*WZp^(_$pUJL-j%EO3n82LG{<aLDjBgmk?TiMow^;zJ!KNtDL=ITdFLXBx
z$l4=(!3L~Ddz^j>KXIU5z(SlwOV0mE_~z|JWHO6A^=44SL$u`plQG^|8_SgI2R5bv
zE$G4}T#mHM7>P0zY5;n0E1Euzx0SKZ0^nwqCO*g9xP&P{>h28W0j*dXQ?nKy!|?_d
zRVmS8EXe`7<GcP^Jt)L_Z=%VQ@p~)YU~`oW`r&j0`j7+6$I3+d!+0MxpNT+SSdL{W
zz^MRyuJh&(Rq0U~uTv%3g}brP^OxWqn8q_a$OOKFD>#z^6yipfVsR8N6B>z|Ivuqa
z0m@ias|OWp$Gw=GDSXXoHa<F;3w9Li>j6}39u_3j7atv|qfdvz_i7`5>y=Yoti$(w
z_?~M7&=#Xy#<eI_UMDhr8O4f5AEzyNRbx!E@A~Ry-|+2GrU6{fX#f}EtpL9V00rm7
U5)(C^VgLXD07*qoM6N<$f?n39f&c&j

literal 0
HcmV?d00001