Avoid appending Pass where already present.

[jpienaar]

Summary

Avoid PassPass cases by not blindly appending Pass. Currently pass definitions
in ODS either end or don't with Pass. This is contrary to Ops & Attr (Types are
inconsistent in this regard) where Op and Attr are appended to the name. Change
the PassGen behavior to not append 'Pass' again this avoids 'PassPass' suffix
(which I can't think where we'd need) and we can update naming to be consistent
incrementally.

[mehdi_amini]

Seems like a "hack" to me, why not fix the source?

[jpienaar]

In D91480#2395774, @mehdi_amini wrote:

Seems like a "hack" to me, why not fix the source?

Ops & attrs have Op and Attr as suffix, I want Pass definition to behave the same. This is only a hack in that it doesn't enforce or flag an error if you don't end a pass description with Pass in the def name. The fix in the source is to go append Pass everywhere, but then with the existing code you'd get registerXPassPass which is what this is addressing. Post this yes we can fix the source and not have registerXPassPass for def XPass : Pass.

[mehdi_amini]

I'm not sure if you're saying that the desired end state is to add a Pass suffix or not?
Either way, why not just implement the desired end-state immediately?

[jpienaar]

In D91480#2412695, @mehdi_amini wrote:

I'm not sure if you're saying that the desired end state is to add a Pass suffix or not?

The desired end state is to add a Pass suffix always.

Either way, why not just implement the desired end-state immediately?

That is a mechanical change that could be done with sed. I can add it in along with this, but I felt it would obscure the code change and so I had though of doing that as a follow up instead. But I can also add it in along with this change. Up to you.

[mehdi_amini]

Yes I prefer to keep the code base in a uniform state as much as possible, thanks!

[rriddle]

In D91480#2412709, @mehdi_amini wrote:

Yes I prefer to keep the code base in a uniform state as much as possible, thanks!

+1. This cleanup seems like it would be small enough to just do it outright.

mlir/tools/mlir-tblgen/PassGen.cpp

 
 inline void register{0}Passes() {{
 )";
 
 /// Emit the code for registering each of the given passes with the global
 /// PassRegistry.
 static void emitRegistration(ArrayRef<Pass> passes, raw_ostream &os) {
   os << "#ifdef GEN_PASS_REGISTRATION\n";
+  auto passName = [](const llvm::Record *def) {
+    // Drop "Pass" at end of name.
+    // TODO: Update to make passes ending with Pass default to conform with how
+    // Ops, Types & Attr definition works.
+    StringRef ret(def->getName());
+    ret.consume_back("Pass");
+    return ret;
+  };
   for (const Pass &pass : passes) {
-    os << llvm::formatv(passRegistrationCode, pass.getDef()->getName(),
+    os << llvm::formatv(passRegistrationCode, passName(pass.getDef()),
                         pass.getArgument(), pass.getSummary(),
                         pass.getConstructor());
   }
 
   os << llvm::formatv(passGroupRegistrationCode, groupName);
   for (const Pass &pass : passes)
-    os << "  register" << pass.getDef()->getName() << "Pass();\n";
+    os << "  register" << passName(pass.getDef()) << "Pass();\n";
   os << "}\n";
   os << "#undef GEN_PASS_REGISTRATION\n";
   os << "#endif // GEN_PASS_REGISTRATION\n";
 }
 
 //===----------------------------------------------------------------------===//
 // GEN: Registration hooks
 //===----------------------------------------------------------------------===//