Support isProductChildOf in IGCCSPIRVSupportTblGen

Support `isProductChildOf` in `IGCCSPIRVSupportTblGen`

Author: aratajew

IGC/AdaptorOCL/Utils/IGCCSPIRVSupportTblGen/IGCCSPIRVPlatformSupport.h

@@ -33,6 +33,7 @@ enum class PlatformSupportKind {
   NotSupported,
   InheritFromExtension,
   CoreChildOf,
+  ProductChildOf,
   ExactPlatform,
   InGroup,
   AnyOf,
@@ -69,6 +70,8 @@ inline PlatformSupportKind classifyPlatformSupport(const Record *R) {
     return PlatformSupportKind::InheritFromExtension;
   if (R->isSubClassOf("isCoreChildOf"))
     return PlatformSupportKind::CoreChildOf;
+  if (R->isSubClassOf("isProductChildOf"))
+    return PlatformSupportKind::ProductChildOf;
   if (R->isSubClassOf("ExactPlatform"))
     return PlatformSupportKind::ExactPlatform;
   if (R->isSubClassOf("isInGroup"))

IGC/AdaptorOCL/Utils/IGCCSPIRVSupportTblGen/IGCCSPIRVSupportTblGen.cpp

@@ -147,6 +147,12 @@ void SPIRVSupportDocsEmitter::accumulatePlatformTokens(const Record *Support, st
     Tokens.insert(Token);
     return;
   }
+  case PlatformSupportKind::ProductChildOf: {
+    const Record *BasePlatform = Support->getValueAsDef("BasePlatform");
+    std::string Token = (BasePlatform->getValueAsString("ProductFamily") + StringRef(" and newer")).str();
+    Tokens.insert(Token);
+    return;
+  }
   case PlatformSupportKind::ExactPlatform: {
     const Record *Plat = Support->getValueAsDef("TargetPlatform");
     std::string Token = Plat->getValueAsString("ProductFamily").str();
@@ -219,6 +225,10 @@ void SPIRVSupportQueriesEmitter::emitSPIRVExtensionStructures(raw_ostream &OS) {
   OS << "inline bool isCoreChildOf(PLATFORM Platform, GFXCORE_FAMILY Core) {\n";
   OS << "  return Platform.eRenderCoreFamily >= Core;\n";
   OS << "}\n\n";
+  OS << "// Helper function for product family hierarchy checks\n";
+  OS << "inline bool isProductChildOf(PLATFORM Platform, PRODUCT_FAMILY Product) {\n";
+  OS << "  return Platform.eProductFamily >= Product;\n";
+  OS << "}\n\n";
   OS << "// SPIR-V Extension and Capability structures\n";
   OS << "struct SPIRVCapability {\n";
   OS << "  std::string Name;\n";
@@ -360,6 +370,11 @@ std::string SPIRVSupportQueriesEmitter::buildPredicate(const Record *Support, St
     StringRef BaseRenderCoreFamily = BaseCore->getValueAsString("RenderCoreFamily");
     return (Twine("isCoreChildOf(" + PlatformVar + ", ") + BaseRenderCoreFamily + ")").str();
   }
+  case PlatformSupportKind::ProductChildOf: {
+    const Record *BasePlatform = Support->getValueAsDef("BasePlatform");
+    StringRef BaseProductFamily = BasePlatform->getValueAsString("ProductFamily");
+    return (Twine("isProductChildOf(" + PlatformVar + ", ") + BaseProductFamily + ")").str();
+  }
   case PlatformSupportKind::ExactPlatform: {
     const Record *Platform = Support->getValueAsDef("TargetPlatform");
     StringRef ProductFamily = Platform->getValueAsString("ProductFamily");

IGC/AdaptorOCL/ocl_igc_interface/extensions/SPIRVExtensions_Common.td

@@ -94,6 +94,10 @@ class isCoreChildOf<CoreFamily baseCore> : PlatformSupport {
   CoreFamily BaseCore = baseCore;
 }
 
+class isProductChildOf<Platform basePlatform> : PlatformSupport {
+  Platform BasePlatform = basePlatform;
+}
+
 class ExactPlatform<Platform platform> : PlatformSupport {
   Platform TargetPlatform = platform;
 }