[clang] retrofit amd-staging for options refactor

Author: macurtis-amd

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -1438,7 +1438,7 @@ void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
       addRPathCmdArg(Args, CmdArgs, CandidateRPath_lib);
 
     std::string rocmPath =
-        Args.getLastArgValue(clang::driver::options::OPT_rocm_path_EQ).str();
+        Args.getLastArgValue(clang::options::OPT_rocm_path_EQ).str();
     if (rocmPath.size() != 0) {
       std::string rocmPath_lib = rocmPath + "/lib";
       std::string rocmPath_suf = rocmPath + "/" + LibSuffix;

clang/lib/Driver/ToolChains/Linux.cpp

@@ -734,7 +734,7 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
   if (DriverArgs.hasArg(options::OPT_nostdinc))
     return;
 
-  if (DriverArgs.hasArg(clang::driver::options::OPT_fopenmp)) {
+  if (DriverArgs.hasArg(clang::options::OPT_fopenmp)) {
     // Look for system files in our compiler AOMP/include dir first
     addSystemInclude(DriverArgs, CC1Args,
                      DriverArgs.MakeArgString(D.Dir + "/../include"));

clang/tools/driver/driver.cpp

@@ -350,8 +350,8 @@ int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContext) {
   unsigned NumParallelJobs =
       getLastArgIntValue(ArgList, options::OPT_parallel_jobs_EQ, 1, Diags);
   UseNewCC1Process =
-      ArgList.hasFlag(clang::driver::options::OPT_fno_integrated_cc1,
-                      clang::driver::options::OPT_fintegrated_cc1,
+      ArgList.hasFlag(clang::options::OPT_fno_integrated_cc1,
+                      clang::options::OPT_fintegrated_cc1,
                       /*Default=*/NumParallelJobs > 1 ? true : CLANG_SPAWN_CC1);
 
   if (!DiagOpts->DiagnosticSerializationFile.empty()) {

flang/lib/Frontend/CompilerInvocation.cpp

@@ -481,17 +481,16 @@ static void parseCodeGenArgs(Fortran::frontend::CodeGenOptions &opts,
     opts.Underscoring = 0;
   }
 
-  if (args.hasFlag(clang::driver::options::OPT_foffload_global_filtering,
-                   clang::driver::options::OPT_fno_offload_global_filtering,
-                   false)) {
+  if (args.hasFlag(clang::options::OPT_foffload_global_filtering,
+                   clang::options::OPT_fno_offload_global_filtering, false)) {
     opts.OffloadGlobalFiltering = 1;
   }
 
   parseDoConcurrentMapping(opts, args, diags);
 
   opts.DeferDescriptorMapping =
-      args.hasFlag(clang::driver::options::OPT_fdefer_desc_map,
-                   clang::driver::options::OPT_fno_defer_desc_map, true);
+      args.hasFlag(clang::options::OPT_fdefer_desc_map,
+                   clang::options::OPT_fno_defer_desc_map, true);
 
   if (const llvm::opt::Arg *arg =
           args.getLastArg(clang::options::OPT_complex_range_EQ)) {
@@ -872,7 +871,7 @@ static bool parseFrontendArgs(FrontendOptions &opts, llvm::opt::ArgList &args,
                                     false));
 
   // -ffast-amd-memory-allocator
-  if (args.hasArg(clang::driver::options::OPT_ffast_amd_memory_allocator)) {
+  if (args.hasArg(clang::options::OPT_ffast_amd_memory_allocator)) {
     opts.features.Enable(
         (Fortran::common::LanguageFeature::AmdMemoryAllocator));
   }
@@ -1339,8 +1338,7 @@ static bool parseOpenMPArgs(CompilerInvocation &res, llvm::opt::ArgList &args,
     }
   }
 
-  if (args.hasArg(
-          clang::driver::options::OPT_famd_allow_threadprivate_equivalence))
+  if (args.hasArg(clang::options::OPT_famd_allow_threadprivate_equivalence))
     res.getLangOpts().AllowThreadprivateEquivalence = true;
 
   return diags.getNumErrors() == numErrorsBefore;