Fix header order botched by clang-format in recent commit.

antmicro · Oct 18, 2023 · b5828a7 · b5828a7
1 parent 51a1822
commit b5828a7
Show file tree

Hide file tree

Showing 110 changed files with 219 additions and 133 deletions.
diff --git a/.clang-format b/.clang-format
@@ -63,6 +63,8 @@ ForEachMacros:
 SortIncludes:    true
 IncludeBlocks:   Regroup
 IncludeCategories:
+  - Regex:           '"V3Pch.*\.h"'
+    Priority:        -2 # Precompiled headers
   - Regex:           '"(config_build|verilated_config|verilatedos)\.h"'
     Priority:        -1 # Sepecials before main header
   - Regex:           '(<|")verilated.*'

diff --git a/src/V3Active.cpp b/src/V3Active.cpp
@@ -26,11 +26,12 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Active.h"
 
 #include "V3Const.h"
 #include "V3Graph.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 #include <unordered_map>
 

diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp
@@ -23,10 +23,11 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3ActiveTop.h"
 
 #include "V3Const.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3SenTree.h"
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp
@@ -14,9 +14,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Assert.h"
 
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Stats.h"
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp
@@ -19,10 +19,11 @@
 //      Transform clocking blocks into imperative logic
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3AssertPre.h"
 
 #include "V3Const.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Task.h"
 #include "V3UniqueNames.h"
 

diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
@@ -14,10 +14,11 @@
 //
 //*************************************************************************
 
+#include "V3PchAstMT.h"
+
 #include "V3Broken.h"
 #include "V3EmitV.h"
 #include "V3File.h"
-#include "V3PchAstMT.h"
 
 #include <iomanip>
 #include <memory>

diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp
@@ -14,17 +14,13 @@
 //
 //*************************************************************************
 
-#include "config_build.h"
-#include "verilatedos.h"
+#include "V3PchAstMT.h"
 
-#include "V3Ast.h"
 #include "V3EmitCBase.h"
 #include "V3File.h"
-#include "V3Global.h"
 #include "V3Graph.h"
 #include "V3Hasher.h"
 #include "V3PartitionGraph.h"  // Just for mtask dumping
-#include "V3PchAstMT.h"
 #include "V3String.h"
 
 #include "V3Ast__gen_macros.h"  // Generated by 'astgen'

diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp
@@ -26,10 +26,10 @@
 //
 //*************************************************************************
 
-#include "V3Begin.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3Begin.h"
+
 VL_DEFINE_DEBUG_FUNCTIONS;
 
 //######################################################################

diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp
@@ -23,10 +23,10 @@
 //
 //*************************************************************************
 
-#include "V3Branch.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3Branch.h"
+
 VL_DEFINE_DEBUG_FUNCTIONS;
 
 //######################################################################

diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp
@@ -22,10 +22,10 @@
 //
 //*************************************************************************
 
-#include "V3Broken.h"
-
 #include "V3PchAstMT.h"
 
+#include "V3Broken.h"
+
 // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators
 #include "V3AstConstOnly.h"
 

diff --git a/src/V3CCtors.cpp b/src/V3CCtors.cpp
@@ -24,10 +24,11 @@
 //      This transformation honors outputSplitCFuncs.
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3CCtors.h"
 
 #include "V3EmitCBase.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 #include <list>
 

diff --git a/src/V3CUse.cpp b/src/V3CUse.cpp
@@ -22,10 +22,10 @@
 //
 //*************************************************************************
 
-#include "V3CUse.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3CUse.h"
+
 VL_DEFINE_DEBUG_FUNCTIONS;
 
 //######################################################################

diff --git a/src/V3Case.cpp b/src/V3Case.cpp
@@ -34,9 +34,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Case.h"
 
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Stats.h"
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp
@@ -37,10 +37,10 @@
 //
 //*************************************************************************
 
-#include "V3Cast.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3Cast.h"
+
 VL_DEFINE_DEBUG_FUNCTIONS;
 
 //######################################################################

diff --git a/src/V3Class.cpp b/src/V3Class.cpp
@@ -20,9 +20,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Class.h"
 
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3UniqueNames.h"
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp
@@ -23,10 +23,10 @@
 //
 //*************************************************************************
 
-#include "V3Clean.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3Clean.h"
+
 VL_DEFINE_DEBUG_FUNCTIONS;
 
 //######################################################################

diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp
@@ -27,9 +27,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Clock.h"
 
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Sched.h"
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp
@@ -19,11 +19,12 @@
 //      Also drop empty CFuncs
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Combine.h"
 
 #include "V3AstUserAllocator.h"
 #include "V3DupFinder.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Stats.h"
 
 #include <list>

diff --git a/src/V3Common.cpp b/src/V3Common.cpp
@@ -20,10 +20,11 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Common.h"
 
 #include "V3EmitCBase.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 VL_DEFINE_DEBUG_FUNCTIONS;
 

diff --git a/src/V3Config.cpp b/src/V3Config.cpp
@@ -14,9 +14,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstMT.h"
+
 #include "V3Config.h"
 
-#include "V3PchAstMT.h"
 #include "V3String.h"
 
 #include <set>

diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp
@@ -24,10 +24,10 @@
 //
 //*************************************************************************
 
-#include "V3Coverage.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3Coverage.h"
+
 #include <unordered_map>
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp
@@ -17,10 +17,11 @@
 //      If two COVERTOGGLEs have same VARSCOPE, combine them
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3CoverageJoin.h"
 
 #include "V3DupFinder.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Stats.h"
 
 #include <vector>

diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp
@@ -33,10 +33,10 @@
 // here after scoping to allow more dead node removal.
 //*************************************************************************
 
-#include "V3Dead.h"
-
 #include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
+#include "V3Dead.h"
+
 #include <vector>
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp
@@ -48,9 +48,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Delayed.h"
 
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3Stats.h"
 
 #include <deque>

diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp
@@ -23,9 +23,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Depth.h"
 
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3UniqueNames.h"
 
 VL_DEFINE_DEBUG_FUNCTIONS;

diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp
@@ -20,10 +20,11 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3DepthBlock.h"
 
 #include "V3EmitCBase.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 VL_DEFINE_DEBUG_FUNCTIONS;
 

diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp
@@ -22,10 +22,11 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Descope.h"
 
 #include "V3EmitCBase.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 VL_DEFINE_DEBUG_FUNCTIONS;
 

diff --git a/src/V3Dfg.cpp b/src/V3Dfg.cpp
@@ -14,10 +14,11 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Dfg.h"
 
 #include "V3File.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 VL_DEFINE_DEBUG_FUNCTIONS;
 

diff --git a/src/V3DfgAstToDfg.cpp b/src/V3DfgAstToDfg.cpp
@@ -26,9 +26,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Dfg.h"
 #include "V3DfgPasses.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 VL_DEFINE_DEBUG_FUNCTIONS;
 

diff --git a/src/V3DfgDecomposition.cpp b/src/V3DfgDecomposition.cpp
@@ -18,9 +18,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Dfg.h"
 #include "V3File.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 
 #include <deque>
 #include <unordered_map>

diff --git a/src/V3DfgDfgToAst.cpp b/src/V3DfgDfgToAst.cpp
@@ -26,9 +26,10 @@
 //
 //*************************************************************************
 
+#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
+
 #include "V3Dfg.h"
 #include "V3DfgPasses.h"
-#include "V3PchAstNoMT.h"  // VL_MT_DISABLED_CODE_UNIT
 #include "V3UniqueNames.h"
 
 #include <unordered_map>