Fix namespace issue in isDialectOp

This is using the `cppNamespace`. Use the IR-level namespace instead.
GPUOpen-Drivers · Oct 2, 2024 · 6338bda · 6338bda
1 parent bdfb113
commit 6338bda
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 158 deletions.
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -23,9 +23,9 @@ set(EXAMPLE_TABLEGEN_EXE llvm-dialects-tblgen)
 set(EXAMPLE_TABLEGEN_TARGET llvm-dialects-tblgen)
 set(LLVM_TARGET_DEFINITIONS ExampleDialect.td)
 
-tablegen(EXAMPLE ExampleDialect.h.inc -gen-dialect-decls --dialect xd
+tablegen(EXAMPLE ExampleDialect.h.inc -gen-dialect-decls --dialect xd.ir
     EXTRA_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-tablegen(EXAMPLE ExampleDialect.cpp.inc -gen-dialect-defs --dialect xd
+tablegen(EXAMPLE ExampleDialect.cpp.inc -gen-dialect-defs --dialect xd.ir
     EXTRA_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 add_public_tablegen_target(ExampleDialectTableGen)
 

diff --git a/example/ExampleDialect.td b/example/ExampleDialect.td
@@ -26,7 +26,7 @@
 include "llvm-dialects/Dialect/Dialect.td"
 
 def ExampleDialect : Dialect {
-  let name = "xd";
+  let name = "xd.ir";
   let cppNamespace = "xd";
 }
 

diff --git a/lib/TableGen/GenDialect.cpp b/lib/TableGen/GenDialect.cpp
@@ -316,7 +316,7 @@ void llvm_dialects::genDialectDefs(raw_ostream& out, RecordKeeper& records) {
     }
 
     bool $Dialect::isDialectOp(::llvm::StringRef funcName) {
-      return funcName.starts_with("$namespace.");
+      return funcName.starts_with("$dialect.");
     }
 
     ::llvm_dialects::Dialect* $Dialect::make(::llvm::LLVMContext& context) {