From 672d37d9b7e25dde0b2a88973b079bde47cfcd54 Mon Sep 17 00:00:00 2001
From: foreman
Date: Wed, 9 Nov 2016 18:36:38 -0500
Subject: [PATCH] P4 to Git Change 1339076 by scharupa@scharupa_temp on
2016/11/09 18:21:08
SWDEV-95488 - Replacing gpuDevice_ with roc_device_
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.hpp#5 edit
---
rocclr/runtime/device/rocm/rocvirtual.cpp | 3 +--
rocclr/runtime/device/rocm/rocvirtual.hpp | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/rocclr/runtime/device/rocm/rocvirtual.cpp b/rocclr/runtime/device/rocm/rocvirtual.cpp
index 83b879754f..61e5c077dc 100644
--- a/rocclr/runtime/device/rocm/rocvirtual.cpp
+++ b/rocclr/runtime/device/rocm/rocvirtual.cpp
@@ -451,7 +451,6 @@ VirtualGPU::VirtualGPU(Device &device)
: device::VirtualDevice(device)
, roc_device_(device)
, index_(device.numOfVgpus_++) // Virtual gpu unique index incrementing
- , gpuDevice_(device)
{
gpu_device_ = device.getBackendDevice();
// Initialize the last signal and dispatch flags
@@ -479,7 +478,7 @@ VirtualGPU::~VirtualGPU()
}
tools_lib_ = NULL;
- --gpuDevice_.numOfVgpus_; // Virtual gpu unique index decrementing
+ --roc_device_.numOfVgpus_; // Virtual gpu unique index decrementing
}
bool
diff --git a/rocclr/runtime/device/rocm/rocvirtual.hpp b/rocclr/runtime/device/rocm/rocvirtual.hpp
index 254ea6a911..8ff19db976 100644
--- a/rocclr/runtime/device/rocm/rocvirtual.hpp
+++ b/rocclr/runtime/device/rocm/rocvirtual.hpp
@@ -247,7 +247,6 @@ private:
uint kernarg_pool_cur_offset_;
std::vector signal_pool_; //!< Pool of signals for profiling
- Device& gpuDevice_; //!< Roc device obj
const uint index_; //!< Virtual gpu unique index
friend class Timestamp;
};