diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS index 433b73981..1e38536c7 100644 --- a/docs/CONTRIBUTORS +++ b/docs/CONTRIBUTORS @@ -332,6 +332,7 @@ Tracy Narine Trung Nguyen Tudor Timi Tymoteusz Blazejczyk +Tynan McAuley Tyrone Marhguy Udaya Raj Subedi Udi Finkelstein diff --git a/src/V3VariableOrder.cpp b/src/V3VariableOrder.cpp index 30bf3cf4d..42dab5bb1 100644 --- a/src/V3VariableOrder.cpp +++ b/src/V3VariableOrder.cpp @@ -27,7 +27,6 @@ #include "V3AstUserAllocator.h" #include "V3EmitCBase.h" #include "V3ExecGraph.h" -#include "V3ThreadPool.h" #include #include @@ -215,7 +214,7 @@ class VariableOrder final { public: static void processModule(AstNodeModule* modp, const MTaskAffinityMap& mTaskAffinity, - std::vector& varps) VL_MT_STABLE { + std::vector& varps) { VariableOrder{modp, mTaskAffinity, varps}; } }; @@ -240,16 +239,9 @@ void V3VariableOrder::orderAll(AstNetlist* netlistp) { // Sort variables for each module std::unordered_map> sortedVars; - { - V3ThreadScope threadScope; - - for (AstNodeModule* modp = v3Global.rootp()->modulesp(); modp; - modp = VN_AS(modp->nextp(), NodeModule)) { - std::vector& varps = sortedVars[modp]; - threadScope.enqueue([modp, &mTaskAffinity, &varps]() { - VariableOrder::processModule(modp, mTaskAffinity, varps); - }); - } + for (AstNodeModule* modp = v3Global.rootp()->modulesp(); modp; + modp = VN_AS(modp->nextp(), NodeModule)) { + VariableOrder::processModule(modp, mTaskAffinity, sortedVars[modp]); } if (v3Global.opt.stats()) V3Stats::statsStage("variableorder-sort");