[SYCL-MLIR][cgeist] Do not use SingleBlock::push_back on gpu.module

mlir/include/mlir/IR/Block.h

@@ -211,11 +211,11 @@ class Block : public IRObjectWithUseList<BlockOperand>,
   //===--------------------------------------------------------------------===//
 
   /// Get the terminator operation of this block. This function asserts that
-  /// the block has a valid terminator operation.
+  /// the block might have a valid terminator operation.
   Operation *getTerminator();
 
-  /// Check whether this block has a terminator.
-  bool hasTerminator();
+  /// Check whether this block might have a terminator.
+  bool mightHaveTerminator();
 
   //===--------------------------------------------------------------------===//
   // Predecessors and successors.

mlir/include/mlir/IR/OpDefinition.h

@@ -932,10 +932,6 @@ struct SingleBlock : public TraitBase<ConcreteType, SingleBlock> {
   }
   template <typename OpT = ConcreteType>
   enable_if_single_region<OpT> insert(Block::iterator insertPt, Operation *op) {
-    Block *body = getBody();
-    // Insert op before the block's terminator if it has one
-    if (insertPt == body->end() && body->hasTerminator())
-      insertPt = Block::iterator(body->getTerminator());
     getBody()->getOperations().insert(insertPt, op);
   }
 };

mlir/lib/IR/Block.cpp

@@ -234,14 +234,14 @@ void Block::eraseArguments(function_ref<bool(BlockArgument)> shouldEraseFn) {
 //===----------------------------------------------------------------------===//
 
 /// Get the terminator operation of this block. This function asserts that
-/// the block has a valid terminator operation.
+/// the block might have a valid terminator operation.
 Operation *Block::getTerminator() {
-  assert(hasTerminator());
+  assert(mightHaveTerminator());
   return &back();
 }
 
-/// Check whether this block has a terminator.
-bool Block::hasTerminator() {
+/// Check whether this block might have a terminator.
+bool Block::mightHaveTerminator() {
   return !empty() && back().mightHaveTrait<OpTrait::IsTerminator>();
 }
 

polygeist/tools/cgeist/Lib/clang-mlir.cc

@@ -2148,11 +2148,13 @@ MLIRASTConsumer::createMLIRFunction(const FunctionToEmit &FTE,
     Module->push_back(Function);
     Functions[MangledName] = cast<func::FuncOp>(Function);
     break;
-  case InsertionContext::SYCLDevice:
-    mlirclang::getDeviceModule(*Module).push_back(Function);
+  case InsertionContext::SYCLDevice: {
+    gpu::GPUModuleOp deviceModule = mlirclang::getDeviceModule(*Module);
+    deviceModule.insert(deviceModule.getBody()->getTerminator(), Function);
     DeviceFunctions[MangledName] = Function;
     break;
   }
+  }
 
   LLVM_DEBUG(llvm::dbgs() << "Created MLIR function: " << Function << "\n");