From 1380df62d922c198c9805a5b5b528ec389bf2e19 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 5 Sep 2018 14:45:11 -0400 Subject: [PATCH] P4 to Git Change 1602019 by marsenau@marsenau-fiji on 2018/09/05 14:33:40 SWDEV-79445 - Remove use of irif. This is now directly linked in the library build and will be removed as a standalone library. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#67 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#83 edit --- rocclr/runtime/device/pal/palprogram.cpp | 10 ++++------ rocclr/runtime/device/rocm/rocprogram.cpp | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp index aaee299398..998285277c 100644 --- a/rocclr/runtime/device/pal/palprogram.cpp +++ b/rocclr/runtime/device/pal/palprogram.cpp @@ -61,7 +61,7 @@ bool Segment::alloc(HSAILProgram& prog, amdgpu_hsa_elf_segment_t segment, size_t } if (zero && !prog.isInternal()) { - uint64_t pattern = 0; + uint64_t pattern = 0; size_t patternSize = ((size % sizeof(pattern)) == 0) ? sizeof(pattern) : 1; prog.dev().xferMgr().fillBuffer(*gpuAccess_, &pattern, patternSize, amd::Coord3D(0), amd::Coord3D(size)); @@ -1329,17 +1329,15 @@ bool LightningProgram::linkImpl(amd::option::Options* options) { C->NewBufferReference(DT_LLVM_BC, (const char*)opencl_amdgcn, opencl_amdgcn_size); Data* ocml_bc = C->NewBufferReference(DT_LLVM_BC, (const char*)ocml_amdgcn, ocml_amdgcn_size); Data* ockl_bc = C->NewBufferReference(DT_LLVM_BC, (const char*)ockl_amdgcn, ockl_amdgcn_size); - Data* irif_bc = C->NewBufferReference(DT_LLVM_BC, (const char*)irif_amdgcn, irif_amdgcn_size); - if (!opencl_bc || !ocml_bc || !ockl_bc || !irif_bc) { + if (!opencl_bc || !ocml_bc || !ockl_bc) { buildLog_ += "Error: Failed to open the bitcode library.\n"; return false; } inputs.push_back(opencl_bc); // depends on oclm & ockl - inputs.push_back(ockl_bc); // depends on irif - inputs.push_back(ocml_bc); // depends on irif - inputs.push_back(irif_bc); + inputs.push_back(ockl_bc); + inputs.push_back(ocml_bc); // open the control functions auto isa_version = get_oclc_isa_version(dev().hwInfo()->gfxipVersion_); diff --git a/rocclr/runtime/device/rocm/rocprogram.cpp b/rocclr/runtime/device/rocm/rocprogram.cpp index c250fac915..7ede4a31e8 100644 --- a/rocclr/runtime/device/rocm/rocprogram.cpp +++ b/rocclr/runtime/device/rocm/rocprogram.cpp @@ -1048,17 +1048,15 @@ bool LightningProgram::linkImpl(amd::option::Options* options) { C->NewBufferReference(DT_LLVM_BC, (const char*)opencl_amdgcn, opencl_amdgcn_size); Data* ocml_bc = C->NewBufferReference(DT_LLVM_BC, (const char*)ocml_amdgcn, ocml_amdgcn_size); Data* ockl_bc = C->NewBufferReference(DT_LLVM_BC, (const char*)ockl_amdgcn, ockl_amdgcn_size); - Data* irif_bc = C->NewBufferReference(DT_LLVM_BC, (const char*)irif_amdgcn, irif_amdgcn_size); - if (!opencl_bc || !ocml_bc || !ockl_bc || !irif_bc) { + if (!opencl_bc || !ocml_bc || !ockl_bc) { buildLog_ += "Error: Failed to open the bitcode library.\n"; return false; } inputs.push_back(opencl_bc); // depends on oclm & ockl - inputs.push_back(ockl_bc); // depends on irif - inputs.push_back(ocml_bc); // depends on irif - inputs.push_back(irif_bc); + inputs.push_back(ockl_bc); + inputs.push_back(ocml_bc); // open the control functions auto isa_version = get_oclc_isa_version(dev().deviceInfo().gfxipVersion_);