From 2aad2059f9f8866982e7af065d3df7104b637116 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 13 Jul 2017 13:46:40 -0400
Subject: [PATCH] P4 to Git Change 1433763 by lmoriche@lmoriche_opencl_dev2 on
 2017/07/13 12:41:17

	SWDEV-102733 - Remove an old instance var that was used by the finalizer path.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.hpp#13 edit
---
 rocclr/runtime/device/rocm/rocdevice.hpp  | 1 -
 rocclr/runtime/device/rocm/rocprogram.cpp | 5 -----
 rocclr/runtime/device/rocm/rocprogram.hpp | 1 -
 rocclr/runtime/device/rocm/rocvirtual.hpp | 1 -
 4 files changed, 8 deletions(-)

diff --git a/rocclr/runtime/device/rocm/rocdevice.hpp b/rocclr/runtime/device/rocm/rocdevice.hpp
index 7e348c0b3a..f148efa76b 100644
--- a/rocclr/runtime/device/rocm/rocdevice.hpp
+++ b/rocclr/runtime/device/rocm/rocdevice.hpp
@@ -25,7 +25,6 @@
 
 #include "hsa.h"
 #include "hsa_ext_image.h"
-#include "hsa_ext_finalize.h"
 #include "hsa_ext_amd.h"
 #include "hsa_ven_amd_loader.h"
 
diff --git a/rocclr/runtime/device/rocm/rocprogram.cpp b/rocclr/runtime/device/rocm/rocprogram.cpp
index a4e417b163..6923762380 100644
--- a/rocclr/runtime/device/rocm/rocprogram.cpp
+++ b/rocclr/runtime/device/rocm/rocprogram.cpp
@@ -75,10 +75,6 @@ HSAILProgram::~HSAILProgram() {
   if (hsaExecutable_.handle != 0) {
     hsa_executable_destroy(hsaExecutable_);
   }
-  // Destroy the program handle.
-  if (hsaProgramHandle_.handle != 0) {
-    hsa_ext_program_destroy(hsaProgramHandle_);
-  }
   releaseClBinary();
 
 #if defined(WITH_LIGHTNING_COMPILER)
@@ -97,7 +93,6 @@ HSAILProgram::HSAILProgram(roc::NullDevice& device) : Program(device), binaryElf
   binOpts_.alloc = &::malloc;
   binOpts_.dealloc = &::free;
 
-  hsaProgramHandle_.handle = 0;
   hsaExecutable_.handle = 0;
 
   hasGlobalStores_ = false;
diff --git a/rocclr/runtime/device/rocm/rocprogram.hpp b/rocclr/runtime/device/rocm/rocprogram.hpp
index f3b6528bc5..bb720a41b0 100644
--- a/rocclr/runtime/device/rocm/rocprogram.hpp
+++ b/rocclr/runtime/device/rocm/rocprogram.hpp
@@ -155,7 +155,6 @@ class HSAILProgram : public device::Program {
   bool hasGlobalStores_;      //!< program has writable program scope variables
 
   /* HSA executable */
-  hsa_ext_program_t hsaProgramHandle_;  //!< Handle to HSA runtime program
   hsa_executable_t hsaExecutable_;      //!< Handle to HSA executable
 
 #if defined(WITH_LIGHTNING_COMPILER)
diff --git a/rocclr/runtime/device/rocm/rocvirtual.hpp b/rocclr/runtime/device/rocm/rocvirtual.hpp
index 85075552c3..f8faf6b462 100644
--- a/rocclr/runtime/device/rocm/rocvirtual.hpp
+++ b/rocclr/runtime/device/rocm/rocvirtual.hpp
@@ -8,7 +8,6 @@
 #include "utils/util.hpp"
 #include "hsa.h"
 #include "hsa_ext_image.h"
-#include "hsa_ext_finalize.h"
 #include "hsa_ext_amd.h"
 #include "rocprintf.hpp"