Cleanup GTSystemInfo interface

Change-Id: I4a47cf10dbf1d74a7f96792db34eeb2b011f0f0f

Author: PawelJurek

IGC/AdaptorOCL/ocl_igc_interface/gt_system_info.h

@@ -94,7 +94,6 @@ CIF_DEFINE_INTERFACE_VER(GTSystemInfo, 1){
 
 CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(GTSystemInfo, 2, 1) {
   CIF_INHERIT_CONSTRUCTOR();
-
 };
 
 CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(GTSystemInfo, 3, 1) {
@@ -108,7 +107,7 @@ CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(GTSystemInfo, 3, 1) {
 
 CIF_GENERATE_VERSIONS_LIST(GTSystemInfo);
 CIF_MARK_LATEST_VERSION(GTSystemInfoLatest, GTSystemInfo);
-using GTSystemInfoTagOCL = GTSystemInfo<2>;    // Note : can tag with different version for
+using GTSystemInfoTagOCL = GTSystemInfo<3>;    // Note : can tag with different version for
                                                //        transition periods
 
 }

IGC/AdaptorOCL/ocl_igc_interface/impl/gt_system_info_impl.cpp

@@ -61,13 +61,12 @@ DEFINE_GET_SET(GTSystemInfo, 1, CsrSizeInMb, uint32_t);
 DEFINE_GET_SET(GTSystemInfo, 1, MaxEuPerSubSlice, uint32_t);
 DEFINE_GET_SET(GTSystemInfo, 1, MaxSlicesSupported, uint32_t);
 DEFINE_GET_SET(GTSystemInfo, 1, MaxSubSlicesSupported, uint32_t);
-
-DEFINE_GET_SET(GTSystemInfo, 3, MaxDualSubSlicesSupported, uint32_t);
-
 DEFINE_GET_SET(GTSystemInfo, 1, IsL3HashModeEnabled, bool);
 DEFINE_GET_SET(GTSystemInfo, 1, IsDynamicallyPopulated, bool);
 
+DEFINE_GET_SET(GTSystemInfo, 3, MaxDualSubSlicesSupported, uint32_t);
 DEFINE_GET_SET(GTSystemInfo, 3, DualSubSliceCount, uint32_t);
+
 }
 
 #include "cif/macros/disable.h"

IGC/AdaptorOCL/ocl_igc_interface/platform_helper.h

@@ -88,9 +88,11 @@ inline void PopulateInterfaceWith(IGC::GTSystemInfo<Ver> &dst,
 }
 
 template <typename SrcStructT>
-inline void PopulateInterfaceWith(IGC::GTSystemInfo<2>& dst,
+inline void PopulateInterfaceWith(IGC::GTSystemInfo<3>& dst,
                                   const SrcStructT& src) {
   PopulateInterfaceWith<1>(dst, src);
+  COPY_VAL_EXACT(MaxDualSubSlicesSupported);
+  COPY_VAL_EXACT(DualSubSliceCount);
 }
 
 }