[ser] Remove SER from LangOpts and check for SM6.9+ instead

Author: simoll

include/dxc/Support/HLSLOptions.h

@@ -249,7 +249,6 @@ class DxcOpts {
   bool PrintAfterAll;                   // OPT_print_after_all
   std::set<std::string> PrintAfter;     // OPT_print_after
   bool EnablePayloadQualifiers = false; // OPT_enable_payload_qualifiers
-  bool EnableShaderExecutionReordering = false;
   bool HandleExceptions = false;        // OPT_disable_exception_handling
 
   // Rewriter Options

lib/DxcSupport/HLSLOptions.cpp

@@ -904,9 +904,6 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
     return 1;
   }
 
-  opts.EnableShaderExecutionReordering =
-      DXIL::CompareVersions(Major, Minor, 6, 9) >= 0;
-
   opts.HandleExceptions =
       !Args.hasFlag(OPT_disable_exception_handling, OPT_INVALID, false);
 

tools/clang/include/clang/Basic/LangOptions.h

@@ -162,7 +162,6 @@ class LangOptions : public LangOptionsBase {
   bool EnableDX9CompatMode = false;
   bool EnableFXCCompatMode = false;
   bool EnablePayloadAccessQualifiers = false;
-  bool EnableShaderExecutionReordering = false;
   bool DumpImplicitTopLevelDecls = true;
   bool ExportShadersOnly = false;
   hlsl::DXIL::DefaultLinkage DefaultLinkage =

tools/clang/include/clang/Frontend/CodeGenOptions.h

@@ -244,8 +244,6 @@ class CodeGenOptions : public CodeGenOptionsBase {
   bool HLSLEnableLifetimeMarkers = false;
   /// Put shader sources and options in the module
   bool HLSLEmbedSourcesInModule = false;
-  /// Enable Shader Execution Reordering.
-  bool HLSLEnableShaderExecutionReordering = false;
   /// Enable generation of payload access qualifier metadata. 
   bool HLSLEnablePayloadAccessQualifiers = false;
   /// Binding table for HLSL resources

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -3701,8 +3701,6 @@ class HLSLExternalSource : public ExternalSemaSource {
     const auto *SM =
         hlsl::ShaderModel::GetByName(m_sema->getLangOpts().HLSLProfile.c_str());
     CXXRecordDecl *nodeOutputDecl = nullptr, *emptyNodeOutputDecl = nullptr;
-    const bool EnableSER =
-        m_sema->getLangOpts().EnableShaderExecutionReordering;
 
     for (unsigned i = 0; i < _countof(g_ArBasicKindsAsTypes); i++) {
       ArBasicKind kind = g_ArBasicKindsAsTypes[i];
@@ -3779,7 +3777,7 @@ class HLSLExternalSource : public ExternalSemaSource {
         recordDecl = DeclareRayQueryType(*m_context);
       } else if (kind == AR_OBJECT_HIT_OBJECT) {
         // Declare 'HitObject' in '::dx' extension namespace.
-        if (EnableSER) {
+        if (SM->IsSM69Plus()) {
           DXASSERT(m_dxNSDecl, "namespace ::dx must be declared in SM6.9+");
           recordDecl = DeclareHitObjectType(*m_dxNSDecl);
         }
@@ -5084,13 +5082,13 @@ class HLSLExternalSource : public ExternalSemaSource {
   }
 
   bool IsEnabledIntrinsic(const HLSL_INTRINSIC *pIntrinsic,
-                          const LangOptions LangOpts) {
+                          const ShaderModel &SM) {
     switch ((IntrinsicOp)pIntrinsic->Op) {
     default:
       return true;
     case IntrinsicOp::MOP_DxHitObject_MakeNop:
     case IntrinsicOp::IOP_DxMaybeReorderThread:
-      return LangOpts.EnableShaderExecutionReordering;
+      return SM.IsSM69Plus();
     }
   }
 
@@ -5147,6 +5145,9 @@ class HLSLExternalSource : public ExternalSemaSource {
     }
 #endif // ENABLE_SPIRV_CODEGEN
 
+    const auto *SM =
+        hlsl::ShaderModel::GetByName(m_sema->getLangOpts().HLSLProfile.c_str());
+
     IntrinsicDefIter cursor = FindIntrinsicByNameAndArgCount(
         table, tableCount, StringRef(), nameIdentifier, Args.size());
     IntrinsicDefIter end = IntrinsicDefIter::CreateEnd(
@@ -5159,7 +5160,7 @@ class HLSLExternalSource : public ExternalSemaSource {
       // configuration. Note that this not necessary for member functions:
       // if the builtin type is never declared, neither will any type refer
       // to the member intrinsics table.
-      if (!IsEnabledIntrinsic(*cursor, m_sema->getLangOpts()))
+      if (!IsEnabledIntrinsic(*cursor, *SM))
         continue;
 
       // If this is the intrinsic we're interested in, build up a representation
@@ -11935,7 +11936,7 @@ void Sema::DiagnoseReachableCallForSER(CallExpr *CE, DXIL::ShaderKind EntrySK,
     Diag(EntryFD->getLocation(), diag::note_hlsl_entry_defined_here);
   }
 
-  if (!getLangOpts().EnableShaderExecutionReordering) {
+  if (!SM->IsSM69Plus()) {
     // Legal entry, but version not supported
     Diag(Loc, diag::err_hlsl_ser_invalid_version) << SM->GetName();
   }

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -1530,8 +1530,6 @@ class DxcCompiler : public IDxcCompiler3,
 
     compiler.getLangOpts().EnablePayloadAccessQualifiers =
         Opts.EnablePayloadQualifiers;
-    compiler.getLangOpts().EnableShaderExecutionReordering =
-        Opts.EnableShaderExecutionReordering;
     compiler.getLangOpts().HLSLProfile = compiler.getCodeGenOpts().HLSLProfile =
         Opts.TargetProfile;
     const ShaderModel *SM = hlsl::ShaderModel::GetByName(
@@ -1629,8 +1627,6 @@ class DxcCompiler : public IDxcCompiler3,
         Opts.EnableLifetimeMarkers;
     compiler.getCodeGenOpts().HLSLEnablePayloadAccessQualifiers =
         Opts.EnablePayloadQualifiers;
-    compiler.getCodeGenOpts().HLSLEnableShaderExecutionReordering =
-        Opts.EnableShaderExecutionReordering;
 
     // Translate signature packing options
     if (Opts.PackPrefixStable)