[FIRRTL] Drop Source/Sink Annotation Support

include/circt/Dialect/FIRRTL/AnnotationDetails.h

@@ -161,12 +161,6 @@ constexpr const char *loadMemoryFromFileAnnoClass =
 constexpr const char *loadMemoryFromFileInlineAnnoClass =
     "firrtl.annotations.MemoryFileInlineAnnotation";
 
-// WiringTransform Annotations
-constexpr const char *wiringSinkAnnoClass =
-    "firrtl.passes.wiring.SinkAnnotation";
-constexpr const char *wiringSourceAnnoClass =
-    "firrtl.passes.wiring.SourceAnnotation";
-
 // Attribute annotations.
 constexpr const char *attributeAnnoClass = "firrtl.AttributeAnnotation";
 

include/circt/Dialect/FIRRTL/FIRRTLAnnotationHelper.h

@@ -279,16 +279,6 @@ struct WiringProblem {
   RefTypeUsage refTypeUsage;
 };
 
-/// A representation of a legacy Wiring problem consisting of a signal source
-/// that should be connected to one or many sinks.
-struct LegacyWiringProblem {
-  /// A source to wire from.
-  Value source;
-
-  /// Sink(s) to wire to.
-  SmallVector<Value> sinks;
-};
-
 /// A store of pending modifications to a FIRRTL module associated with solving
 /// one or more WiringProblems.
 struct ModuleModifications {
@@ -356,7 +346,6 @@ struct ApplyState {
   bool noRefTypePorts;
 
   DenseSet<InstanceOp> wiringProblemInstRefs;
-  DenseMap<StringAttr, LegacyWiringProblem> legacyWiringProblems;
   SmallVector<WiringProblem> wiringProblems;
 
   hw::InnerSymbolNamespace &getNamespace(FModuleLike module) {

lib/Dialect/FIRRTL/Transforms/CMakeLists.txt

@@ -23,7 +23,6 @@ add_circt_dialect_library(CIRCTFIRRTLTransforms
   InferWidths.cpp
   InjectDUTHierarchy.cpp
   InnerSymbolDCE.cpp
-  LegacyWiring.cpp
   LinkCircuits.cpp
   Lint.cpp
   LayerMerge.cpp

lib/Dialect/FIRRTL/Transforms/LowerAnnotations.cpp

@@ -672,8 +672,6 @@ static llvm::StringMap<AnnoRecord> annotationRecords{{
     {loadMemoryFromFileAnnoClass, {stdResolve, applyLoadMemoryAnno<false>}},
     {loadMemoryFromFileInlineAnnoClass,
      {stdResolve, applyLoadMemoryAnno<true>}},
-    {wiringSinkAnnoClass, {stdResolve, applyWiring}},
-    {wiringSourceAnnoClass, {stdResolve, applyWiring}},
     {attributeAnnoClass, {stdResolve, applyAttributeAnnotation}}}};
 
 LogicalResult
@@ -713,7 +711,6 @@ struct LowerAnnotationsPass
 
   void runOnOperation() override;
   LogicalResult applyAnnotation(DictionaryAttr anno, ApplyState &state);
-  LogicalResult legacyToWiringProblems(ApplyState &state);
   LogicalResult solveWiringProblems(ApplyState &state);
 
   SmallVector<DictionaryAttr> worklistAttrs;
@@ -758,26 +755,6 @@ LogicalResult LowerAnnotationsPass::applyAnnotation(DictionaryAttr anno,
   return success();
 }
 
-/// Convert consumed SourceAnnotation and SinkAnnotation into WiringProblems,
-/// using the pin attribute as newNameHint
-LogicalResult LowerAnnotationsPass::legacyToWiringProblems(ApplyState &state) {
-  for (const auto &[name, problem] : state.legacyWiringProblems) {
-    if (!problem.source)
-      return mlir::emitError(state.circuit.getLoc())
-             << "Unable to resolve source for pin: " << name;
-
-    if (problem.sinks.empty())
-      return mlir::emitError(state.circuit.getLoc())
-             << "Unable to resolve sink(s) for pin: " << name;
-
-    for (const auto &sink : problem.sinks) {
-      state.wiringProblems.push_back(
-          {problem.source, sink, {}, WiringProblem::RefTypeUsage::Never});
-    }
-  }
-  return success();
-}
-
 /// Modify the circuit to solve and apply all Wiring Problems in the circuit.  A
 /// Wiring Problem is a mapping from a source to a sink that can be connected
 /// via a base Type or RefType as requested.  This uses a two-step approach.
@@ -1229,9 +1206,6 @@ void LowerAnnotationsPass::runOnOperation() {
       ++numFailures;
   }
 
-  if (failed(legacyToWiringProblems(state)))
-    ++numFailures;
-
   if (failed(solveWiringProblems(state)))
     ++numFailures;