From e79d60996ccd3275755d3b396ca7648d1b86fb15 Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Thu, 18 Jan 2024 23:24:12 +0000
Subject: [PATCH] SWDEV-441201,SWDEV-441727 - Move BlitProgram creation after
 trap handler build

Change-Id: I89199ccc4bdf79940dc6693e07c03115c52bf613


[ROCm/clr commit: 5d322c027a30b45b74d2b500ce984b108031f0b8]
---
 projects/clr/rocclr/device/pal/paldevice.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp
index 6f65ad422b..a1e1247ce2 100644
--- a/projects/clr/rocclr/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/device/pal/paldevice.cpp
@@ -2601,15 +2601,6 @@ bool Device::createBlitProgram() {
     }
   }
 
-  blitProgram_ = new BlitProgram(context_);
-  // Create blit programs
-  if (blitProgram_ == nullptr || !blitProgram_->create(this, extraBlits, ocl20)) {
-    delete blitProgram_;
-    blitProgram_ = nullptr;
-    LogError("Couldn't create blit kernels!");
-    result = false;
-  }
-
   if (settings().useLightning_) {
     const std::string TrapHandlerAsm = TrapHandlerCode;
     // Create a program for trap handler
@@ -2635,6 +2626,15 @@ bool Device::createBlitProgram() {
       DevLogPrintfError("Trap handler creation failed\n");
     }
   }
+
+  blitProgram_ = new BlitProgram(context_);
+  // Create blit programs
+  if (blitProgram_ == nullptr || !blitProgram_->create(this, extraBlits, ocl20)) {
+    delete blitProgram_;
+    blitProgram_ = nullptr;
+    LogError("Couldn't create blit kernels!");
+    result = false;
+  }
   return result;
 }