[LowerToHW][nfc] Use function to record mapping

Add a member function for recording a mapping of old FIRRTL module to new HW module. Use this to avoid some tedious repeated code that manipulates two mappings (old to new and new to old) directly. Signed-off-by: Schuyler Eldridge <[email protected]>
llvm · Mar 3, 2024 · 49b5331 · 49b5331
1 parent b213b74
commit 49b5331
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/Conversion/FIRRTLToHW/LowerToHW.cpp b/lib/Conversion/FIRRTLToHW/LowerToHW.cpp
@@ -273,6 +273,11 @@ struct CircuitLoweringState {
     return it != newToOldModuleMap.end() ? it->second : nullptr;
   }
 
+  void recordModuleMapping(Operation *oldFMod, Operation *newHWMod) {
+    oldToNewModuleMap[oldFMod] = newHWMod;
+    newToOldModuleMap[newHWMod] = oldFMod;
+  }
+
   // Process remaining annotations and emit warnings on unprocessed annotations
   // still remaining in the annoSet.
   void processRemainingAnnotations(Operation *op, const AnnotationSet &annoSet);
@@ -610,8 +615,7 @@ void FIRRTLModuleLowering::runOnOperation() {
               if (!loweredMod)
                 return failure();
 
-              state.oldToNewModuleMap[&op] = loweredMod;
-              state.newToOldModuleMap[loweredMod] = &op;
+              state.recordModuleMapping(&op, loweredMod);
               modulesToProcess.push_back(loweredMod);
               // Lower all the alias types.
               module.walk([&](Operation *op) {
@@ -628,17 +632,15 @@ void FIRRTLModuleLowering::runOnOperation() {
                   lowerExtModule(extModule, topLevelModule, state);
               if (!loweredMod)
                 return failure();
-              state.oldToNewModuleMap[&op] = loweredMod;
-              state.newToOldModuleMap[loweredMod] = &op;
+              state.recordModuleMapping(&op, loweredMod);
               return success();
             })
             .Case<FMemModuleOp>([&](auto memModule) {
               auto loweredMod =
                   lowerMemModule(memModule, topLevelModule, state);
               if (!loweredMod)
                 return failure();
-              state.oldToNewModuleMap[&op] = loweredMod;
-              state.newToOldModuleMap[loweredMod] = &op;
+              state.recordModuleMapping(&op, loweredMod);
               return success();
             })
             .Default([&](Operation *op) {