[FIRRTL] GCT Taps Annos AnnotationDetails.h, NFC

Move annotation class names associated with Grand Central Data/Mem Taps into the common AnnotationDetails.h header so that these can be used by more passes. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
hunterzju · Oct 23, 2021 · 2513be7 · 2513be7
1 parent 36b6d67
commit 2513be7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/lib/Dialect/FIRRTL/AnnotationDetails.h b/lib/Dialect/FIRRTL/AnnotationDetails.h
@@ -36,6 +36,20 @@ constexpr const char *omirFileAnnoClass =
 constexpr const char *omirTrackerAnnoClass =
     "freechips.rocketchip.objectmodel.OMIRTracker";
 
+// Grand Central Annotations
+constexpr const char *dataTapsClass =
+    "sifive.enterprise.grandcentral.DataTapsAnnotation";
+constexpr const char *memTapClass =
+    "sifive.enterprise.grandcentral.MemTapAnnotation";
+constexpr const char *deletedKeyClass =
+    "sifive.enterprise.grandcentral.DeletedDataTapKey";
+constexpr const char *literalKeyClass =
+    "sifive.enterprise.grandcentral.LiteralDataTapKey";
+constexpr const char *referenceKeyClass =
+    "sifive.enterprise.grandcentral.ReferenceDataTapKey";
+constexpr const char *internalKeyClass =
+    "sifive.enterprise.grandcentral.DataTapModuleSignalKey";
+
 } // namespace firrtl
 } // namespace circt
 

diff --git a/lib/Dialect/FIRRTL/Transforms/GrandCentralTaps.cpp b/lib/Dialect/FIRRTL/Transforms/GrandCentralTaps.cpp
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PassDetails.h"
+#include "../AnnotationDetails.h"
 #include "circt/Dialect/FIRRTL/FIRRTLAnnotations.h"
 #include "circt/Dialect/FIRRTL/FIRRTLOps.h"
 #include "circt/Dialect/FIRRTL/FIRRTLTypes.h"
@@ -51,23 +52,6 @@ struct PointerLikeTypeTraits<InstanceOp> : PointerLikeTypeTraits<Operation *> {
 };
 } // end namespace llvm
 
-//===----------------------------------------------------------------------===//
-// Static class names
-//===----------------------------------------------------------------------===//
-
-static constexpr const char *dataTapsClass =
-    "sifive.enterprise.grandcentral.DataTapsAnnotation";
-static constexpr const char *memTapClass =
-    "sifive.enterprise.grandcentral.MemTapAnnotation";
-static constexpr const char *deletedKeyClass =
-    "sifive.enterprise.grandcentral.DeletedDataTapKey";
-static constexpr const char *literalKeyClass =
-    "sifive.enterprise.grandcentral.LiteralDataTapKey";
-static constexpr const char *referenceKeyClass =
-    "sifive.enterprise.grandcentral.ReferenceDataTapKey";
-static constexpr const char *internalKeyClass =
-    "sifive.enterprise.grandcentral.DataTapModuleSignalKey";
-
 //===----------------------------------------------------------------------===//
 // Utilities
 //===----------------------------------------------------------------------===//