#462: Build performance: Removed dependence of geo.dll on clc.dll by …

…moving the commonly used IndexGetters and UnitCreators to tic.dll
ObjectVision · Jul 5, 2024 · f9ffeb4 · f9ffeb4
1 parent 5a5747c
commit f9ffeb4
Show file tree

Hide file tree

Showing 15 changed files with 167 additions and 202 deletions.
diff --git a/all22.sln b/all22.sln
@@ -60,7 +60,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeoDmsRun", "run\exe\DmsRun
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geo", "geo\dll\GeoDLL.vcxproj", "{C0C75A4B-DD01-4272-8FB5-3A242DA125BA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{41DD88B1-2F24-45AA-9CBB-4318F97BBC22} = {41DD88B1-2F24-45AA-9CBB-4318F97BBC22}
 		{DF25D3CA-DD28-4F0D-870A-09B12EADCB2E} = {DF25D3CA-DD28-4F0D-870A-09B12EADCB2E}
 		{F77FAD2B-615A-47D7-AE87-A6F996D63C12} = {F77FAD2B-615A-47D7-AE87-A6F996D63C12}
 	EndProjectSection

diff --git a/clc/dll/Clc.vcxproj b/clc/dll/Clc.vcxproj
@@ -71,7 +71,6 @@
     <ClCompile Include="src\GetStatistics.cpp" />
     <ClCompile Include="src\ID.cpp" />
     <ClCompile Include="src\Index.cpp" />
-    <ClCompile Include="src\IndexGetterCreator.cpp" />
     <ClCompile Include="src\Invert.cpp" />
     <ClCompile Include="src\JoinEqualValues.cpp" />
     <ClCompile Include="src\lookup.cpp" />
@@ -88,7 +87,6 @@
     <ClCompile Include="src\Subset.cpp" />
     <ClCompile Include="src\Union.cpp" />
     <ClCompile Include="src\Unique.cpp" />
-    <ClCompile Include="src\UnitCreators.cpp" />
     <ClCompile Include="src\OperAttrVar.cpp" />
     <ClCompile Include="src\BoostBlas.cpp" />
     <ClCompile Include="src\BoostXML.cpp" />
@@ -158,7 +156,6 @@
     <ClInclude Include="include\ExprCalculator.h" />
     <ClInclude Include="include\funclist.h" />
     <ClInclude Include="include\IndexAssigner.h" />
-    <ClInclude Include="include\IndexGetterCreator.h" />
     <ClInclude Include="include\Invert.h" />
     <ClInclude Include="include\InvertedRel.h" />
     <ClInclude Include="include\lookup.h" />
@@ -177,10 +174,8 @@
     <ClInclude Include="include\Prototypes.h" />
     <ClInclude Include="include\RemoveAdjacentsAndSpikes.h" />
     <ClInclude Include="include\rlookup.h" />
-    <ClInclude Include="include\UnitCreators.h" />
     <ClInclude Include="include\UnitGroup.h" />
     <ClInclude Include="include\CalcClassBreaks.h" />
-    <ClInclude Include="include\ValueGetter.h" />
     <ClInclude Include="include\ValuesTable.h" />
     <ClInclude Include="include\ValuesTableTypes.h" />
     <ClInclude Include="src\RLookup.ipp" />

diff --git a/clc/dll/Clc.vcxproj.filters b/clc/dll/Clc.vcxproj.filters
@@ -55,9 +55,6 @@
     <ClCompile Include="src\Index.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\IndexGetterCreator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Invert.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,9 +145,6 @@
     <ClCompile Include="src\Unique.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\UnitCreators.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\AggrBinStructNum.h">
@@ -225,9 +219,6 @@
     <ClInclude Include="include\IndexAssigner.h">
       <Filter>Clc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\IndexGetterCreator.h">
-      <Filter>Clc Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\makeCululative.h">
       <Filter>Clc Header Files</Filter>
     </ClInclude>
@@ -267,15 +258,9 @@
     <ClInclude Include="include\OperUnit.h">
       <Filter>Clc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\ValueGetter.h">
-      <Filter>Clc Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\UnitGroup.h">
       <Filter>Clc Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\UnitCreators.h">
-      <Filter>Clc Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\rlookup.h">
       <Filter>Clc Header Files</Filter>
     </ClInclude>

diff --git a/clc/dll/include/ClcBase.h b/clc/dll/include/ClcBase.h
@@ -23,21 +23,5 @@
 
 #include "OperGroups.h"
 
-// *****************************************************************************
-// oper groups that are used in multiple untis
-// *****************************************************************************
-
-// defined in UnitCreators.cpp
-extern CLC_CALL CommonOperGroup cog_mul;
-extern CLC_CALL CommonOperGroup cog_div;
-extern CLC_CALL CommonOperGroup cog_add;
-extern CLC_CALL CommonOperGroup cog_sub;
-extern CLC_CALL CommonOperGroup cog_bitand;
-extern CLC_CALL CommonOperGroup cog_bitor;
-extern CLC_CALL CommonOperGroup cog_bitxor;
-extern CLC_CALL CommonOperGroup cog_pow;
-extern CLC_CALL CommonOperGroup cog_eq;
-extern CLC_CALL CommonOperGroup cog_ne;
-extern CLC_CALL CommonOperGroup cog_substr;
 
 #endif
diff --git a/clc/dll/include/ValueGetter.h b/clc/dll/include/ValueGetter.h
diff --git a/geo/dll/GeoDLL.vcxproj b/geo/dll/GeoDLL.vcxproj
@@ -62,9 +62,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\clc\dll\Clc.vcxproj">
-      <Project>{41dd88b1-2f24-45aa-9cbb-4318f97bbc22}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\rtc\dll\DmRtc.vcxproj">
       <Project>{f1f7b558-ce16-4452-a876-eadb679a4463}</Project>
     </ProjectReference>

diff --git a/tic/dll/DmTic.vcxproj b/tic/dll/DmTic.vcxproj
@@ -58,6 +58,7 @@
     <ClCompile Include="src\Aspect.cpp" />
     <ClCompile Include="src\DedicatedAttrs.cpp" />
     <ClCompile Include="src\ExprRewrite.cpp" />
+    <ClCompile Include="src\IndexGetterCreator.cpp" />
     <ClCompile Include="src\ItemLocks.cpp" />
     <ClCompile Include="src\LispContextHandle.cpp" />
     <ClCompile Include="src\OperationContext.cpp" />
@@ -105,6 +106,7 @@
     <ClCompile Include="src\TreeItemUtils.cpp" />
     <ClCompile Include="src\Unit.cpp" />
     <ClCompile Include="src\UnitClass.cpp" />
+    <ClCompile Include="src\UnitCreators.cpp" />
     <ClCompile Include="src\UsingCache.cpp" />
     <ClCompile Include="src\Xml\XmlTreeOut.cpp" />
     <ClCompile Include="src\Xml\XmlTreeParser.cpp" />
@@ -115,6 +117,7 @@
     <ClInclude Include="src\Explain.h" />
     <ClInclude Include="src\ExprRewrite.h" />
     <ClInclude Include="src\FutureTileArray.h" />
+    <ClInclude Include="src\IndexGetterCreator.h" />
     <ClInclude Include="src\ItemLocks.h" />
     <ClInclude Include="src\LispContextHandle.h" />
     <ClInclude Include="src\MetaInfo.h" />
@@ -182,9 +185,11 @@
     <ClInclude Include="src\Unit.h" />
     <ClInclude Include="src\UnitClass.h" />
     <ClInclude Include="src\UnitClassReg.h" />
+    <ClInclude Include="src\UnitCreators.h" />
     <ClInclude Include="src\UnitProcessor.h" />
     <ClInclude Include="src\UsingCache.h" />
     <ClInclude Include="src\valuefiller.h" />
+    <ClInclude Include="src\ValueGetter.h" />
     <ClInclude Include="src\Xml\XmlTreeOut.h" />
     <ClInclude Include="src\Xml\XmlTreeParser.h" />
     <ClInclude Include="src\TileLock.h" />

diff --git a/tic/dll/DmTic.vcxproj.filters b/tic/dll/DmTic.vcxproj.filters
@@ -168,6 +168,12 @@
     <ClCompile Include="src\stg\MemoryMappedDataStorageManager.cpp">
       <Filter>Storage Handling</Filter>
     </ClCompile>
+    <ClCompile Include="src\IndexGetterCreator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UnitCreators.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\AbstrCalculator.h">
@@ -402,6 +408,15 @@
     <ClInclude Include="src\stg\MemoryMappeddataStorageManager.h">
       <Filter>Storage Handling</Filter>
     </ClInclude>
+    <ClInclude Include="src\IndexGetterCreator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UnitCreators.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ValueGetter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\DataArray.ipp">

diff --git a/clc/dll/src/IndexGetterCreator.cpp → tic/dll/src/IndexGetterCreator.cpp b/clc/dll/src/IndexGetterCreator.cpp → tic/dll/src/IndexGetterCreator.cpp
@@ -2,14 +2,16 @@
 // License: GNU GPL 3
 /////////////////////////////////////////////////////////////////////////////
 
-#include "ClcPch.h"
+#include "TicPch.h"
 
 #if defined(CC_PRAGMAHDRSTOP)
 #pragma hdrstop
 #endif
 
 #include "IndexGetterCreator.h"
 
+#include "AbstrDataItem.h"
+#include "DataArray.h"
 #include "DataCheckMode.h"
 
 //=================================== IndexGetter

diff --git a/clc/dll/include/IndexGetterCreator.h → tic/dll/src/IndexGetterCreator.h b/clc/dll/include/IndexGetterCreator.h → tic/dll/src/IndexGetterCreator.h
@@ -5,8 +5,10 @@
 #pragma once
 #endif
 
-#if !defined(DMS_CLC_INDEXGETTER_H)
-#define DMS_CLC_INDEXGETTER_H
+#if !defined(DMS_TIC_INDEXGETTERCREATOR_H)
+#define DMS_TIC_INDEXGETTERCREATOR_H
+
+#include "TicBase.h"
 
 #include "AbstrDataObject.h"
 #include "ValueGetter.h"
@@ -18,10 +20,10 @@ using IndexGetter = AbstrValueGetter<SizeT> ;
 struct IndexGetterCreatorBase : UnitProcessor
 {
 	template <typename E>
-	CLC_CALL void VisitImpl(const Unit<E>* inviter) const;
+	TIC_CALL void VisitImpl(const Unit<E>* inviter) const;
 
 	template <int N>
-	CLC_CALL void VisitImpl(const Unit<bit_value<N>>* inviter) const;
+	TIC_CALL void VisitImpl(const Unit<bit_value<N>>* inviter) const;
 
 	WeakPtr<const AbstrDataItem> m_Adi;
 	tile_id                      m_TileID = no_tile;
@@ -31,8 +33,8 @@ struct IndexGetterCreatorBase : UnitProcessor
 
 struct IndexGetterCreator :  boost::mpl::fold<typelists::domain_elements, IndexGetterCreatorBase, VisitorImpl<Unit<_2>, _1> >::type
 {
-	static CLC_CALL IndexGetter* Create(const AbstrDataItem* adi, tile_id t);
-	static CLC_CALL IndexGetter* Create(const AbstrDataItem* adi, abstr_future_tile* aft);
+	static TIC_CALL IndexGetter* Create(const AbstrDataItem* adi, tile_id t);
+	static TIC_CALL IndexGetter* Create(const AbstrDataItem* adi, abstr_future_tile* aft);
 
 private:
 	IndexGetterCreator(const AbstrDataItem* adi, tile_id t);
@@ -41,4 +43,4 @@ struct IndexGetterCreator :  boost::mpl::fold<typelists::domain_elements, IndexG
 };
 
 
-#endif //!defined(DMS_CLC_INDEXGETTER_H)
+#endif //!defined(DMS_TIC_INDEXGETTERCREATOR_H)