P4 to Git Change 1384479 by kzhuravl@kzhuravl-fiji-cl-on-lc on 2017/03/11 01:30:12

SWDEV-94644 - Fix the build after r297498

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#57 edit

rocclr/runtime/device/pal/palprogram.cpp

@@ -1609,12 +1609,12 @@ LightningProgram::setKernels(
                 //! @todo: Use constants and enums defined in AMDGPUPTNote.h.
                 //! In order to switch to using constants and enums defined in
                 //! AMDGPUPTNote.h, we need to clean up internal header files.
-                if (note->n_type == 7 /*AMDGPU::PT_NOTE::NT_AMDGPU_HSA_RUNTIME_METADATA_V_1*/) {
+                if (note->n_type == 7 /*AMDGPU::ElfNote::NT_AMDGPU_HSA_RUNTIME_METADATA_V_1*/) {
                     buildLog_ += "Error: object code with metadata v1 is not " \
                       "supported\n";
                     return false;
                 }
-                else if (note->n_type == 8 /*AMDGPU::PT_NOTE::NT_AMDGPU_HSA_RUNTIME_METADATA*/
+                else if (note->n_type == 8 /*AMDGPU::ElfNote::NT_AMDGPU_HSA_RUNTIME_METADATA*/
                          && note->n_namesz == sizeof "AMD"
                          && !memcmp(name, "AMD", note->n_namesz)) {
                     std::string metadataStr((const char *) desc, (size_t) note->n_descsz);

rocclr/runtime/device/rocm/rocprogram.cpp

@@ -931,14 +931,14 @@ HSAILProgram::setKernels_LC(amd::option::Options *options, void* binary, size_t
                 address name = (address) &note[1];
                 address desc = name + amd::alignUp(note->n_namesz, sizeof(int));
 
-                if (note->n_type == AMDGPU::PT_NOTE::NT_AMDGPU_HSA_RUNTIME_METADATA_V_1) {
+                if (note->n_type == AMDGPU::ElfNote::NT_AMDGPU_HSA_RUNTIME_METADATA_V_1) {
                     buildLog_ += "Error: object code with metadata v1 is not " \
                       "supported\n";
                     return false;
                 }
-                else if (note->n_type == AMDGPU::PT_NOTE::NT_AMDGPU_HSA_RUNTIME_METADATA
-                         && note->n_namesz == sizeof AMDGPU::PT_NOTE::NoteName
-                         && !memcmp(name, AMDGPU::PT_NOTE::NoteName, note->n_namesz)) {
+                else if (note->n_type == AMDGPU::ElfNote::NT_AMDGPU_HSA_RUNTIME_METADATA
+                         && note->n_namesz == sizeof AMDGPU::ElfNote::NoteName
+                         && !memcmp(name, AMDGPU::ElfNote::NoteName, note->n_namesz)) {
                     std::string metadataStr((const char *) desc, (size_t) note->n_descsz);
                     metadata_ = new AMDGPU::RuntimeMD::Program::Metadata(metadataStr);
                     // We've found and loaded the runtime metadata, exit the