fix insert allocs

Signed-off-by: dchigarev <[email protected]>
intel · Aug 27, 2024 · 899fc02 · 899fc02
1 parent ee45972
commit 899fc02
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/Transforms/CMakeLists.txt b/lib/Transforms/CMakeLists.txt
@@ -24,7 +24,11 @@ add_mlir_library(IMEXTransforms
   MLIRSupport
   MLIRTransformUtils
   MLIRVectorTransforms
+  IMEXXeTileDialect
+  IMEXRegionDialect
 
   DEPENDS
   IMEXTransformsPassIncGen
+  IMEXXeTilePassIncGen
+  MLIRRegionOpsIncGen
 )
diff --git a/lib/Transforms/InsertGPUAllocs.cpp b/lib/Transforms/InsertGPUAllocs.cpp
@@ -44,7 +44,7 @@ class InsertGPUAllocsPass final
     : public imex::impl::InsertGPUAllocsBase<InsertGPUAllocsPass> {
 
 public:
-  explicit InsertGPUAllocsPass() : m_clientAPI("vulkan") {}
+  explicit InsertGPUAllocsPass() : m_clientAPI("opencl") {}
   explicit InsertGPUAllocsPass(const mlir::StringRef &clientAPI)
       : m_clientAPI(clientAPI) {}
 
@@ -411,6 +411,15 @@ class InsertGPUAllocsPass final
             use.set(newAlloc.getResult());
           }
         }
+
+        // remove 'memref.dealloc' (it's later replaced with gpu.dealloc)
+        auto memory = alloc->getResult(0);
+        for (auto u : memory.getUsers()) {
+          if (auto dealloc = mlir::dyn_cast<mlir::memref::DeallocOp>(u)) {
+            dealloc.erase();
+          }
+        }
+
         alloc.replaceAllUsesWith(allocResult);
         builder.create<mlir::gpu::DeallocOp>(loc, std::nullopt, allocResult);
         alloc.erase();

diff --git a/lib/Transforms/SetSPIRVAbiAttribute.cpp b/lib/Transforms/SetSPIRVAbiAttribute.cpp
@@ -32,7 +32,7 @@ namespace {
 class SetSPIRVAbiAttributePass
     : public imex::impl::SetSPIRVAbiAttributeBase<SetSPIRVAbiAttributePass> {
 public:
-  explicit SetSPIRVAbiAttributePass() { m_clientAPI = "vulkan"; }
+  explicit SetSPIRVAbiAttributePass() { m_clientAPI = "opencl"; }
   explicit SetSPIRVAbiAttributePass(const mlir::StringRef &clientAPI)
       : m_clientAPI(clientAPI) {}