From b4ccaeffe126f9718930b85e0fac894b071ee620 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 6 Aug 2018 21:24:14 -0400
Subject: [PATCH] P4 to Git Change 1590010 by
 skudchad@skudchad_test2_win_opencl on 2018/08/06 21:18:48

	SWDEV-145570 - [HIP] - Fix some issues in hip runtime
	- Set stream for event
	- Free mem needs to be reported in bytes but runtime backends reports in Kb

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/15586/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#40 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#15 edit
---
 hipamd/api/hip/hip_memory.cpp | 2 +-
 hipamd/api/hip/hip_module.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hipamd/api/hip/hip_memory.cpp b/hipamd/api/hip/hip_memory.cpp
index d4380eee0b..24ed647acb 100644
--- a/hipamd/api/hip/hip_memory.cpp
+++ b/hipamd/api/hip/hip_memory.cpp
@@ -281,7 +281,7 @@ hipError_t hipMemGetInfo(size_t* free, size_t* total) {
     return hipErrorInvalidValue;
   }
 
-  *free = freeMemory[0];
+  *free = freeMemory[0] * Ki;
   *total = device->info().globalMemSize_;
 
   return hipSuccess;
diff --git a/hipamd/api/hip/hip_module.cpp b/hipamd/api/hip/hip_module.cpp
index 6b154b2d9e..f4a8f6aaa3 100644
--- a/hipamd/api/hip/hip_module.cpp
+++ b/hipamd/api/hip/hip_module.cpp
@@ -198,6 +198,7 @@ hipError_t ihipModuleLaunchKernel(hipFunction_t f,
   }
 
   if(startEvent != nullptr) {
+    eStart->stream_ = queue;
     amd::Command* startCommand = new hip::TimerMarker(*eStart->stream_);
     startCommand->enqueue();
 
@@ -225,6 +226,7 @@ hipError_t ihipModuleLaunchKernel(hipFunction_t f,
     if (eStop->event_ != nullptr) {
       eStop->event_->release();
     }
+    eStop->stream_ = queue;
     eStop->event_ = &command->event();
     command->retain();
   }