From f88e1f570c2bfb72f7bc6ede46b2d380f433d4c2 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Mon, 13 May 2024 18:09:45 +0300
Subject: [PATCH] improved shared memory parallelization

---
 sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp | 3 +++
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp                | 2 +-
 sapfor/experts/Sapfor_2017/_src/Utils/version.h           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp b/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp
index 077fe4f..f2d02c4 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp
@@ -580,6 +580,9 @@ static bool hasSubstringRef(SgExpression* ex)
         if (ex->variant() == ARRAY_OP)
             return true;
 
+        if (ex->variant() == ARRAY_REF && !isArrayRef(ex))
+            return true;
+
         if (ex->lhs())
             res |= hasSubstringRef(ex->lhs());
         if (ex->rhs())
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index eab676b..efa3410 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -1915,7 +1915,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
     else if (curr_regime == FIX_COMMON_BLOCKS)
         fixCommonBlocks(allFuncInfo, commonBlocks, &project);
     else if (curr_regime == SELECT_ARRAY_DIM_CONF) {
-        SelectArrayConfForParallelization(&project, allFuncInfo, loopGraph, SPF_messages, arrayLinksByFuncCalls);
+        ;// SelectArrayConfForParallelization(&project, allFuncInfo, loopGraph, SPF_messages, arrayLinksByFuncCalls);
     }
     else if (curr_regime == GET_MIN_MAX_BLOCK_DIST)
     {
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index c333220..f45280d 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2334"
+#define VERSION_SPF "2336"