Copy GMD IDs correctly so that Workarounds get applied correctly

 Copy GMD IDs correctly so that Workarounds get applied correctly

Author: pszymich

IGC/AdaptorOCL/ocl_igc_interface/impl/platform_impl.cpp

@@ -16,26 +16,36 @@ namespace IGC {
 // Helpers for clarity
 // Basically, these forward GetX/SetX from interface (of given version)
 // to GT_SYSTEM_INFO inside pImpl
-// Prefix is used because members in platform are in hungarian notation
-#define DEFINE_GET_SET_PREFIX(INTERFACE, VERSION, NAME, TYPE, PREFIX)\
+//
+// DEFINE_GET_SET as defined in igc_features_and_workarounds_impl.cpp cannot
+// handle complex objects.
+#define DEFINE_GET_SET_COMPLEX(INTERFACE, VERSION, NAME, TYPE, SOURCE)\
     TYPE CIF_GET_INTERFACE_CLASS(INTERFACE, VERSION)::Get##NAME() const {\
-        return static_cast<TYPE>(CIF_GET_PIMPL()->p.PREFIX##NAME);\
+        return static_cast<TYPE>(CIF_GET_PIMPL()->p.SOURCE);\
     }\
     void CIF_GET_INTERFACE_CLASS(INTERFACE, VERSION)::Set##NAME(TYPE v) {\
-        CIF_GET_PIMPL()->p.PREFIX##NAME = static_cast<decltype(CIF_GET_PIMPL()->p.PREFIX##NAME)>(v);\
+        CIF_GET_PIMPL()->p.SOURCE = static_cast<decltype(CIF_GET_PIMPL()->p.SOURCE)>(v);\
     }
 
-DEFINE_GET_SET_PREFIX(Platform, 1, ProductFamily, TypeErasedEnum, e);
-DEFINE_GET_SET_PREFIX(Platform, 1, PCHProductFamily, TypeErasedEnum, e);
-DEFINE_GET_SET_PREFIX(Platform, 1, DisplayCoreFamily, TypeErasedEnum, e);
-DEFINE_GET_SET_PREFIX(Platform, 1, RenderCoreFamily, TypeErasedEnum, e);
-DEFINE_GET_SET_PREFIX(Platform, 1, PlatformType, TypeErasedEnum, e);
-DEFINE_GET_SET_PREFIX(Platform, 1, DeviceID, unsigned short, us);
-DEFINE_GET_SET_PREFIX(Platform, 1, RevId, unsigned short, us);
-DEFINE_GET_SET_PREFIX(Platform, 1, DeviceID_PCH, unsigned short, us);
-DEFINE_GET_SET_PREFIX(Platform, 1, RevId_PCH, unsigned short, us);
-DEFINE_GET_SET_PREFIX(Platform, 1, GTType, TypeErasedEnum, e);
-
+// Interface version 1.
+DEFINE_GET_SET_COMPLEX(Platform, 1, ProductFamily,     TypeErasedEnum, eProductFamily);
+DEFINE_GET_SET_COMPLEX(Platform, 1, PCHProductFamily,  TypeErasedEnum, ePCHProductFamily);
+DEFINE_GET_SET_COMPLEX(Platform, 1, DisplayCoreFamily, TypeErasedEnum, eDisplayCoreFamily);
+DEFINE_GET_SET_COMPLEX(Platform, 1, RenderCoreFamily,  TypeErasedEnum, eRenderCoreFamily);
+DEFINE_GET_SET_COMPLEX(Platform, 1, PlatformType,      TypeErasedEnum, ePlatformType);
+DEFINE_GET_SET_COMPLEX(Platform, 1, DeviceID,          unsigned short, usDeviceID);
+DEFINE_GET_SET_COMPLEX(Platform, 1, RevId,             unsigned short, usRevId);
+DEFINE_GET_SET_COMPLEX(Platform, 1, DeviceID_PCH,      unsigned short, usDeviceID_PCH);
+DEFINE_GET_SET_COMPLEX(Platform, 1, RevId_PCH,         unsigned short, usRevId_PCH);
+DEFINE_GET_SET_COMPLEX(Platform, 1, GTType,            TypeErasedEnum, eGTType);
+
+// Interface version 2.
+//  Added Render/Media/Display block IDs
+DEFINE_GET_SET_COMPLEX(Platform, 2, RenderBlockID,     unsigned int,   sRenderBlockID.Value);
+DEFINE_GET_SET_COMPLEX(Platform, 2, MediaBlockID,      unsigned int,   sMediaBlockID.Value);
+DEFINE_GET_SET_COMPLEX(Platform, 2, DisplayBlockID,    unsigned int,   sDisplayBlockID.Value);
+
+#undef DEFINE_GET_SET_COMPLEX
 }
 
 #include "cif/macros/disable.h"

IGC/AdaptorOCL/ocl_igc_interface/platform.h

@@ -50,11 +50,21 @@ CIF_DEFINE_INTERFACE_VER(Platform, 1){
   virtual void SetGTType(TypeErasedEnum v);
 };
 
+CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(Platform, 2, 1) {
+  CIF_INHERIT_CONSTRUCTOR();
+
+  virtual void SetRenderBlockID(unsigned int v);
+  virtual unsigned int GetRenderBlockID() const;
+  virtual void SetDisplayBlockID(unsigned int v);
+  virtual unsigned int GetDisplayBlockID() const;
+  virtual void SetMediaBlockID(unsigned int v);
+  virtual unsigned int GetMediaBlockID() const;
+};
+
 CIF_GENERATE_VERSIONS_LIST(Platform);
 CIF_MARK_LATEST_VERSION(PlatformLatest, Platform);
-using PlatformTagOCL = PlatformLatest; // Note : can tag with different version for
-                                       //        transition periods
-
+using PlatformTagOCL = Platform<1>; // Note : can tag with different version for
+                                    //        transition periods
 }
 
 #include "cif/macros/disable.h"

IGC/AdaptorOCL/ocl_igc_interface/platform_helper.h

@@ -34,6 +34,15 @@ inline void PopulateInterfaceWith(IGC::Platform<Ver> &dst,
   COPY_VAL(RevId_PCH, usRevId_PCH);
   COPY_VAL_E(GTType);
 }
+
+template <typename SrcStructT>
+inline void PopulateInterfaceWith(IGC::Platform<2>& dst,
+                                  const SrcStructT& src) {
+  PopulateInterfaceWith<1>(dst, src);
+  COPY_VAL(RenderBlockID, sRenderBlockID.Value);
+  COPY_VAL(MediaBlockID, sMediaBlockID.Value);
+  COPY_VAL(DisplayBlockID, sDisplayBlockID.Value);
+}
 }
 
 namespace GtSysInfoHelper {