From 4a8f4c146a402064e1b36d8ef3cc08803c616afe Mon Sep 17 00:00:00 2001
From: foreman
Date: Fri, 28 Oct 2016 18:38:30 -0400
Subject: [PATCH] P4 to Git Change 1333693 by gandryey@gera-dev-w7 on
2016/10/28 18:25:31
SWDEV-86035 - Add PAL backend to OpenCL
- Use size_t for hidden arguments
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#21 edit
[ROCm/clr commit: 55cab0cc968282350d9dff91d21f57817a969e18]
---
projects/clr/rocclr/runtime/device/pal/palkernel.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/projects/clr/rocclr/runtime/device/pal/palkernel.cpp b/projects/clr/rocclr/runtime/device/pal/palkernel.cpp
index 5de35a5973..42c875c74a 100644
--- a/projects/clr/rocclr/runtime/device/pal/palkernel.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palkernel.cpp
@@ -1006,12 +1006,12 @@ HSAILKernel::loadArguments(
continue;
}
else if (arg->type_ == HSAIL_ARGTYPE_HIDDEN_PRINTF_BUFFER) {
- uint64_t bufferPtr = 0;
+ size_t bufferPtr = 0;
if ((printfInfo().size() > 0) &&
// and printf buffer was allocated
(gpu.printfDbgHSA().dbgBuffer() != nullptr)) {
// and set the fourth argument as the printf_buffer pointer
- bufferPtr = gpu.printfDbgHSA().dbgBuffer()->vmAddress();
+ bufferPtr = static_cast(gpu.printfDbgHSA().dbgBuffer()->vmAddress());
memList.push_back(gpu.printfDbgHSA().dbgBuffer());
}
assert(arg->size_ == sizeof(bufferPtr) && "check the sizes");
@@ -1019,12 +1019,12 @@ HSAILKernel::loadArguments(
continue;
}
else if (arg->type_ == HSAIL_ARGTYPE_HIDDEN_DEFAULT_QUEUE) {
- assert(arg->size_ == sizeof(vmDefQueue) && "check the sizes");
+ assert(arg->size_ == sizeof(static_cast(vmDefQueue)) && "check the sizes");
WriteAqlArg(&aqlArgBuf, &vmDefQueue, arg->size_, arg->alignment_);
continue;
}
else if (arg->type_ == HSAIL_ARGTYPE_HIDDEN_COMPLETION_ACTION) {
- assert(arg->size_ == sizeof(*vmParentWrap) && "check the sizes");
+ assert(arg->size_ == sizeof(static_cast(*vmParentWrap)) && "check the sizes");
WriteAqlArg(&aqlArgBuf, vmParentWrap, arg->size_, arg->alignment_);
continue;
}