address review: remove subtarget integration

Author: PankajDwivedi-25

clang/include/clang/Driver/Options.td

@@ -5497,10 +5497,7 @@ defm wavefrontsize64 : SimpleMFlag<"wavefrontsize64",
   " mode (AMDGPU only)">;
 defm amdgpu_precise_memory_op
     : SimpleMFlag<"amdgpu-precise-memory-op", "Enable", "Disable",
-                  " precise memory mode (AMDGPU only)", m_amdgpu_Features_Group>;
-defm amdgpu_expand_waitcnt_profiling
-    : SimpleMFlag<"amdgpu-expand-waitcnt-profiling", "Enable", "Disable",
-                  " waitcnt expansion for profiling (AMDGPU only)", m_amdgpu_Features_Group>;
+                  " precise memory mode (AMDGPU only)">;
 
 def munsafe_fp_atomics : Flag<["-"], "munsafe-fp-atomics">,
   Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>, Alias<fatomic_ignore_denormal_mode>;

clang/lib/Driver/ToolChains/AMDGPU.cpp

@@ -700,10 +700,6 @@ void amdgpu::getAMDGPUTargetFeatures(const Driver &D,
                    options::OPT_mno_amdgpu_precise_memory_op, false))
     Features.push_back("+precise-memory");
 
-  if (Args.hasFlag(options::OPT_mamdgpu_expand_waitcnt_profiling,
-                   options::OPT_mno_amdgpu_expand_waitcnt_profiling, false))
-    Features.push_back("+expand-waitcnt-profiling");
-
   handleTargetFeaturesGroup(D, Triple, Args, Features,
                             options::OPT_m_amdgpu_Features_Group);
 }

clang/test/Driver/amdgpu-features.c

@@ -38,9 +38,3 @@
 
 // RUN: %clang -### -target amdgcn -mcpu=gfx1010 -mno-amdgpu-precise-memory-op %s 2>&1 | FileCheck --check-prefix=NO-PREC-MEM %s
 // NO-PREC-MEM-NOT: {{".*precise-memory"}}
-
-// RUN: %clang -### -target amdgcn -mcpu=gfx900 -mamdgpu-expand-waitcnt-profiling %s 2>&1 | FileCheck --check-prefix=EXPAND-WAITCNT %s
-// EXPAND-WAITCNT: "-target-feature" "+expand-waitcnt-profiling"
-
-// RUN: %clang -### -target amdgcn -mcpu=gfx900 -mno-amdgpu-expand-waitcnt-profiling %s 2>&1 | FileCheck --check-prefix=NO-EXPAND-WAITCNT %s
-// NO-EXPAND-WAITCNT-NOT: "{{[+]}}expand-waitcnt-profiling"

llvm/lib/Target/AMDGPU/AMDGPU.td

@@ -223,10 +223,6 @@ def FeaturePreciseMemory
     : SubtargetFeature<"precise-memory", "EnablePreciseMemory",
                        "true", "Enable precise memory mode">;
 
-def FeatureExpandWaitcntProfiling
-    : SubtargetFeature<"expand-waitcnt-profiling", "EnableExpandWaitcntProfiling",
-                       "true", "Expand waitcnt instructions for profiling">;
-
 def FeatureSGPRInitBug : SubtargetFeature<"sgpr-init-bug",
   "SGPRInitBug",
   "true",

llvm/lib/Target/AMDGPU/GCNSubtarget.h

@@ -90,7 +90,6 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
   bool EnableCuMode = false;
   bool TrapHandler = false;
   bool EnablePreciseMemory = false;
-  bool EnableExpandWaitcntProfiling = false;
 
   // Used as options.
   bool EnableLoadStoreOpt = false;
@@ -675,10 +674,6 @@ class GCNSubtarget final : public AMDGPUGenSubtargetInfo,
 
   bool isPreciseMemoryEnabled() const { return EnablePreciseMemory; }
 
-  bool isExpandWaitcntProfilingEnabled() const {
-    return EnableExpandWaitcntProfiling;
-  }
-
   bool hasFlatAddressSpace() const {
     return FlatAddressSpace;
   }