Merged main:39e93eee76ab into amd-gfx:d1314f0ddea4

Local branch amd-gfx d1314f0 Merged main:998bdae7f5ce into amd-gfx:1f2edbe54368 Remote branch main 39e93ee [TOSA] Handle dialect check more efficiently (llvm#120960)
GPUOpen-Drivers · Dec 30, 2024 · 9ca7466 · 9ca7466
2 parents d1314f0 + 39e93ee
commit 9ca7466
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/llvm/include/llvm/Config/llvm-config.h.cmake b/llvm/include/llvm/Config/llvm-config.h.cmake
@@ -16,7 +16,7 @@
 
 /* Indicate that this is LLVM compiled from the amd-gfx branch. */
 #define LLVM_HAVE_BRANCH_AMD_GFX
-#define LLVM_MAIN_REVISION 522502
+#define LLVM_MAIN_REVISION 522503
 
 /* Define if LLVM_ENABLE_DUMP is enabled */
 #cmakedefine LLVM_ENABLE_DUMP

diff --git a/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp b/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
@@ -542,9 +542,13 @@ bool TosaValidation::isValidElementType(Type type) {
 
 void TosaValidation::runOnOperation() {
   configLevelAndProfile();
+
+  TosaDialect *tosaDialect = getContext().getLoadedDialect<TosaDialect>();
+  if (!tosaDialect)
+    return;
+
   getOperation().walk([&](Operation *op) {
-    if (!op->getDialect() ||
-        op->getDialect()->getNamespace() != TosaDialect::getDialectNamespace())
+    if (op->getDialect() != tosaDialect)
       return;
 
     for (Value operand : op->getOperands()) {