P4 to Git Change 1551928 by gandryey@gera-w8 on 2018/05/08 12:42:43

SWDEV-151981 - Removal of CPU support on Windows
	- Part 3. Remove device fission extension

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_common.hpp#20 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#59 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#71 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#32 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#218 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#299 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#165 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#26 edit

rocclr/runtime/device/device.cpp

@@ -230,11 +230,6 @@ Device::~Device() {
       delete[] info_.extensions_;
     }
   }
-
-  if (info_.partitionCreateInfo_.type_.byCounts_ &&
-      info_.partitionCreateInfo_.byCounts_.countsList_ != NULL) {
-    delete[] info_.partitionCreateInfo_.byCounts_.countsList_;
-  }
 }
 
 bool Device::create() {
@@ -1635,83 +1630,4 @@ bool ClBinary::isSPIRV() const {
   return false;
 }
 
-cl_device_partition_property PartitionType::toCL() const {
-  static cl_device_partition_property conv[] = {CL_DEVICE_PARTITION_EQUALLY,
-                                                CL_DEVICE_PARTITION_BY_COUNTS,
-                                                CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN};
-  return conv[amd::leastBitSet(value_)];
-}
-
-size_t PartitionType::toCL(cl_device_partition_property* types) const {
-  size_t i = 0;
-  if (equally_) {
-    types[i++] = CL_DEVICE_PARTITION_EQUALLY;
-  }
-  if (byCounts_) {
-    types[i++] = CL_DEVICE_PARTITION_BY_COUNTS;
-  }
-  if (byAffinityDomain_) {
-    types[i++] = CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN;
-  }
-  return i;
-}
-
-cl_device_affinity_domain AffinityDomain::toCL() const { return (cl_device_affinity_domain)value_; }
-
-#ifdef cl_ext_device_fission
-
-cl_device_partition_property_ext PartitionType::toCLExt() const {
-  static cl_device_partition_property_ext conv[] = {CL_DEVICE_PARTITION_EQUALLY_EXT,
-                                                    CL_DEVICE_PARTITION_BY_COUNTS_EXT,
-                                                    CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT};
-  return conv[amd::leastBitSet(value_)];
-}
-
-size_t PartitionType::toCLExt(cl_device_partition_property_ext* types) const {
-  size_t i = 0;
-  if (equally_) {
-    types[i++] = CL_DEVICE_PARTITION_EQUALLY_EXT;
-  }
-  if (byCounts_) {
-    types[i++] = CL_DEVICE_PARTITION_BY_COUNTS_EXT;
-  }
-  if (byAffinityDomain_) {
-    types[i++] = CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT;
-  }
-  return i;
-}
-
-cl_device_partition_property_ext AffinityDomain::toCLExt() const {
-  static cl_device_partition_property_ext conv[] = {
-      CL_AFFINITY_DOMAIN_NUMA_EXT,     CL_AFFINITY_DOMAIN_L4_CACHE_EXT,
-      CL_AFFINITY_DOMAIN_L3_CACHE_EXT, CL_AFFINITY_DOMAIN_L2_CACHE_EXT,
-      CL_AFFINITY_DOMAIN_L1_CACHE_EXT, CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT};
-  return conv[amd::leastBitSet(value_)];
-}
-
-size_t AffinityDomain::toCLExt(cl_device_partition_property_ext* affinities) const {
-  size_t i = 0;
-  if (numa_) {
-    affinities[i++] = CL_AFFINITY_DOMAIN_NUMA_EXT;
-  }
-  if (cacheL4_) {
-    affinities[i++] = CL_AFFINITY_DOMAIN_L4_CACHE_EXT;
-  }
-  if (cacheL3_) {
-    affinities[i++] = CL_AFFINITY_DOMAIN_L3_CACHE_EXT;
-  }
-  if (cacheL2_) {
-    affinities[i++] = CL_AFFINITY_DOMAIN_L2_CACHE_EXT;
-  }
-  if (cacheL1_) {
-    affinities[i++] = CL_AFFINITY_DOMAIN_L1_CACHE_EXT;
-  }
-  if (next_) {
-    affinities[i++] = CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT;
-  }
-  return i;
-}
-
-#endif  // cl_ext_device_fission
-
 }  // namespace device