P4 to Git Change 1450441 by asalmanp@asalmanp-ocl-stg on 2017/08/22 17:11:11

SWDEV-79278 - adding support for Vega12/Vega20/Navi10
	ReviewBoardURL = http://ocltc.amd.com/reviews/r/13326/

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/libUtils.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings.h#20 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/v0_8/target_mappings_hsail64.h#23 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/linker.cpp#156 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABI.h#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/amuABIMultiBinary.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#52 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#48 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#43 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#67 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#148 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#568 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#234 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#352 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#180 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/caltarget.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#28 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLOfflineCompilation.cpp#19 edit

rocclr/runtime/device/gpu/gpuprogram.cpp

@@ -2227,6 +2227,39 @@ hsa_isa_t ORCAHSALoaderContext::IsaFromName(const char* name) {
     isa.handle = gfx901;
     return isa;
   }
+  if (!strcmp(Gfx902, name)) {
+      isa.handle = gfx902;
+      return isa;
+  }
+  if (!strcmp(Gfx903, name)) {
+      isa.handle = gfx903;
+      return isa;
+  }
+  if (!strcmp(Gfx904, name)) {
+      isa.handle = gfx904;
+      return isa;
+  }
+  if (!strcmp(Gfx905, name)) {
+      isa.handle = gfx905;
+      return isa;
+  }
+  if (!strcmp(Gfx906, name)) {
+      isa.handle = gfx906;
+      return isa;
+  }
+  if (!strcmp(Gfx907, name)) {
+      isa.handle = gfx907;
+      return isa;
+  }
+  if (!strcmp(Gfx1000, name)) {
+      isa.handle = gfx1000;
+      return isa;
+  }
+  if (!strcmp(Gfx1001, name)) {
+      isa.handle = gfx1001;
+      return isa;
+  }
+
   return isa;
 }
 
@@ -2262,13 +2295,35 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa)
           return false;
       }
     case gfx900:
+    case gfx901:
+    case gfx902:
+    case gfx903:
+    case gfx904:
+    case gfx905:
+    case gfx906:
+    case gfx907:
       switch (program_->dev().hwInfo()->machine_) {
         case ED_ATI_CAL_MACHINE_GREENLAND_ISA:
           return isa.handle == gfx900 || isa.handle == gfx901;
+        case ED_ATI_CAL_MACHINE_RAVEN_ISA:
+            return isa.handle == gfx902 || isa.handle == gfx903;
+        case ED_ATI_CAL_MACHINE_VEGA12_ISA:
+            return isa.handle == gfx904 || isa.handle == gfx905;
+        case ED_ATI_CAL_MACHINE_VEGA20_ISA:
+            return isa.handle == gfx906 || isa.handle == gfx907;
         default:
           assert(0);
           return false;
       }
+    case gfx1000:
+    case gfx1001:
+      switch (program_->dev().hwInfo()->machine_) {
+        case ED_ATI_CAL_MACHINE_NAVI10_ISA:
+            return isa.handle == gfx1000 || isa.handle == gfx1001;
+        default:
+            assert(0);
+            return false;
+        }
   }
 }