[SYCLomatic] Remove deprecated helper function customization feature and it's test (#1006)

Signed-off-by: Jiang, Zhiwei <[email protected]>

Author: zhiweij1

clang/include/clang/DPCT/DPCTOptions.inc

@@ -253,29 +253,6 @@ DPCT_NON_ENUM_OPTION(DPCT_OPT_TYPE(static llvm::cl::opt<bool>), EnableComments,
            llvm::cl::desc("Insert comments explaining the generated code. Default: off."),
            llvm::cl::cat(DPCTCat), llvm::cl::init(false))
 
-DPCT_ENUM_OPTION(DPCT_OPT_TYPE(static llvm::cl::opt<HelperFilesCustomizationLevel>), UseCustomHelperFileLevel, "use-custom-helper",
-           DPCT_OPTION_VALUES(
-             DPCT_OPT_ENUM("none", int(HelperFilesCustomizationLevel::HFCL_None),
-            "No customization (default).", false),
-             DPCT_OPT_ENUM("file", int(HelperFilesCustomizationLevel::HFCL_File),
-            "Limit helper header files to only the necessary files for the migrated code and\n"
-            "place them in the --out-root directory.", false),
-             DPCT_OPT_ENUM("api", int(HelperFilesCustomizationLevel::HFCL_API),
-            "Limit helper header files to only the necessary APIs for the migrated code and\n"
-            "place them in the --out-root directory.", false),
-             DPCT_OPT_ENUM("all", int(HelperFilesCustomizationLevel::HFCL_All),
-            "Generate a complete set of helper header files and place them in the --out-root\n"
-            "directory.", false)
-           ),
-           llvm::cl::desc("DEPRECATED: Customize the helper header files for migrated code. The values are:\n"),
-           llvm::cl::init(HelperFilesCustomizationLevel::HFCL_None), llvm::cl::value_desc("value"), llvm::cl::cat(DPCTCat),
-           llvm::cl::Optional)
-
-DPCT_NON_ENUM_OPTION(DPCT_OPT_TYPE(static llvm::cl::opt<std::string>), CustomHelperFileName, "custom-helper-name",
-        llvm::cl::desc("DEPRECATED: Specifies the helper headers folder name and main helper header file name.\n"
-        "Default: dpct."),
-        llvm::cl::init("dpct"), llvm::cl::value_desc("name"), llvm::cl::cat(DPCTCat), llvm::cl::Optional)
-
 DPCT_NON_ENUM_OPTION(DPCT_OPT_TYPE(static llvm::cl::opt<bool, true>), AsyncHandler, "always-use-async-handler",
         llvm::cl::desc("Use async exception handler when creating new sycl::queue "
                    "with dpct::create_queue\nin addition to default "

clang/lib/DPCT/DPCT.cpp

@@ -790,22 +790,10 @@ int runDPCT(int argc, const char **argv) {
   }
   ValidateInputDirectory(Tool, AnalysisScope);
 
-  if (GenHelperFunction.getNumOccurrences() &&
-      (UseCustomHelperFileLevel.getNumOccurrences() ||
-       CustomHelperFileName.getNumOccurrences())) {
-    ShowStatus(MigrationErrorConflictOptions,
-               "Option --gen-helper-function cannot be used with "
-               "--use-custom-helper or --custom-helper-name together");
-    dpctExit(MigrationErrorConflictOptions);
-  }
   if (GenHelperFunction.getValue()) {
     dpct::genHelperFunction(dpct::DpctGlobalInfo::getOutRoot());
   }
 
-  validateCustomHelperFileNameArg(UseCustomHelperFileLevel,
-                                  CustomHelperFileName,
-                                  dpct::DpctGlobalInfo::getOutRoot());
-
   Tool.appendArgumentsAdjuster(
       getInsertArgumentAdjuster("-nocudalib", ArgumentInsertPosition::BEGIN));
 
@@ -859,18 +847,11 @@ int runDPCT(int argc, const char **argv) {
   DpctGlobalInfo::setSyclNamedLambda(SyclNamedLambdaFlag);
   DpctGlobalInfo::setUsmLevel(USMLevel);
   DpctGlobalInfo::setIsIncMigration(!NoIncrementalMigration);
-  DpctGlobalInfo::setHelperFilesCustomizationLevel(UseCustomHelperFileLevel);
-  if (UseCustomHelperFileLevel.getNumOccurrences()) {
-    clang::dpct::PrintMsg("Note: Option --use-custom-helper is deprecated and "
-                          "may be removed in the future.\n");
-  }
+  DpctGlobalInfo::setHelperFilesCustomizationLevel(
+      HelperFilesCustomizationLevel::HFCL_None);
   DpctGlobalInfo::setCheckUnicodeSecurityFlag(CheckUnicodeSecurityFlag);
   DpctGlobalInfo::setEnablepProfilingFlag(EnablepProfilingFlag);
-  DpctGlobalInfo::setCustomHelperFileName(CustomHelperFileName);
-  if (CustomHelperFileName.getNumOccurrences()) {
-    clang::dpct::PrintMsg("Note: Option --custom-helper-name is deprecated and "
-                          "may be removed in the future.\n");
-  }
+  DpctGlobalInfo::setCustomHelperFileName("dpct");
   HelperFileNameMap[HelperFileEnum::Dpct] =
       DpctGlobalInfo::getCustomHelperFileName() + ".hpp";
   DpctGlobalInfo::setFormatRange(FormatRng);
@@ -939,8 +920,7 @@ int runDPCT(int argc, const char **argv) {
                      DpctGlobalInfo::isCommentsEnabled(),
                      EnableComments.getNumOccurrences());
     setValueToOptMap(clang::dpct::OPTION_CustomHelperFileName,
-                     DpctGlobalInfo::getCustomHelperFileName(),
-                     CustomHelperFileName.getNumOccurrences());
+                     DpctGlobalInfo::getCustomHelperFileName(), 0);
     setValueToOptMap(clang::dpct::OPTION_CtadEnabled,
                      DpctGlobalInfo::isCtadEnabled(),
                      EnableCTAD.getNumOccurrences());

clang/lib/DPCT/Error.cpp

@@ -140,20 +140,6 @@ void ShowStatus(int Status, std::string Message) {
         "Error: The input for option --use-explicit-namespace is not valid. "
         "Run 'dpct --help' to see supported options and values.";
     break;
-  case MigrationErrorCustomHelperFileNameContainInvalidChar:
-    StatusString =
-        "Error: Custom helper header file name is invalid. The name can only "
-        "contain digits(0-9), underscore(_) or letters(a-zA-Z).";
-    break;
-  case MigrationErrorCustomHelperFileNameTooLong:
-    StatusString = "Error: Custom helper header file name is too long.";
-    break;
-  case MigrationErrorCustomHelperFileNamePathTooLong:
-    StatusString =
-        "Error: The path resulted from --out-root and --custom-helper-name "
-        "option values: \"" +
-        Message + "\" is too long.";
-    break;
   case MigrationErrorDifferentOptSet:
     StatusString =
         "Error: Incremental migration requires the same option sets used "
@@ -175,9 +161,6 @@ void ShowStatus(int Status, std::string Message) {
     StatusString = "Error: The path for --analysis-scope-path is not the same "
                    "as or a parent directory of --in-root";
     break;
-  case MigrationErrorConflictOptions:
-    StatusString = "Error: " + Message;
-    break;
   default:
     DpctLog() << "Unknown error\n";
     dpctExit(-1);

clang/lib/DPCT/Error.h

@@ -46,9 +46,6 @@ enum ProcessStatus {
   MigrationErrorCudaVersionUnsupported = -31,
   MigrationErrorSupportedCudaVersionNotAvailable = -32,
   MigrationErrorInvalidExplicitNamespace = -33,
-  MigrationErrorCustomHelperFileNameContainInvalidChar = -34,
-  MigrationErrorCustomHelperFileNameTooLong = -35,
-  MigrationErrorCustomHelperFileNamePathTooLong = -36,
   MigrationErrorDifferentOptSet = -37,
   MigrationErrorInvalidRuleFilePath = -38,
   MigrationErrorCannotParseRuleFile = -39,

clang/lib/DPCT/ValidateArguments.cpp

@@ -238,36 +238,3 @@ bool checkReportArgs(ReportTypeEnum &RType, ReportFormatEnum &RFormat,
 
   return Success;
 }
-
-void validateCustomHelperFileNameArg(HelperFilesCustomizationLevel Level,
-                                     std::string &Name,
-                                     const std::string &OutRoot) {
-  if ((Level == HelperFilesCustomizationLevel::HFCL_None) && (Name != "dpct")) {
-    clang::dpct::PrintMsg("Warning: Ignored \"--custom-helper-name\", since "
-                          "\"--use-custom-helper\" is not specified or "
-                          "has \"none\" value.\n");
-    Name = "dpct";
-    return;
-  }
-
-  std::string FileName = Name + ".hpp";
-  if (FileName.size() >= MAX_NAME_LEN) {
-    clang::dpct::ShowStatus(MigrationErrorCustomHelperFileNameTooLong);
-    dpctExit(MigrationErrorCustomHelperFileNameTooLong);
-  }
-
-  std::string FilePath = OutRoot + "/include/" + Name + "/" + FileName;
-  if (FilePath.size() >= MAX_PATH_LEN) {
-    clang::dpct::ShowStatus(MigrationErrorCustomHelperFileNamePathTooLong,
-                            FilePath);
-    dpctExit(MigrationErrorCustomHelperFileNamePathTooLong);
-  }
-
-  for (size_t Idx = 0, End = Name.size(); Idx < End; Idx++) {
-    if ((!isdigit(Name[Idx])) && (!isalpha(Name[Idx])) && (Name[Idx] != '_')) {
-      clang::dpct::ShowStatus(
-          MigrationErrorCustomHelperFileNameContainInvalidChar);
-      dpctExit(MigrationErrorCustomHelperFileNameContainInvalidChar);
-    }
-  }
-}

clang/lib/DPCT/ValidateArguments.h

@@ -103,7 +103,4 @@ bool checkReportArgs(ReportTypeEnum &RType, ReportFormatEnum &RFormat,
 /// -1: Path is invalid
 int checkSDKPathOrIncludePath(const std::string &Path, std::string &RealPath);
 
-void validateCustomHelperFileNameArg(HelperFilesCustomizationLevel Level,
-                                     std::string &Name,
-                                     const std::string &OutRoot);
 #endif // DPCT_VALIDATE_ARGUMENTS_H

clang/test/dpct/autocomplete.c

@@ -17,7 +17,6 @@
 // DASH-NEXT: --comments
 // DASH-NEXT: --compilation-database
 // DASH-NEXT: --cuda-include-path
-// DASH-NEXT: --custom-helper-name
 // DASH-NEXT: --enable-ctad
 // DASH-NEXT: --enable-profiling
 // DASH-NEXT: --extra-arg
@@ -47,7 +46,6 @@
 // DASH-NEXT: --suppress-warnings
 // DASH-NEXT: --suppress-warnings-all
 // DASH-NEXT: --sycl-named-lambda
-// DASH-NEXT: --use-custom-helper=
 // DASH-NEXT: --use-dpcpp-extensions=
 // DASH-NEXT: --use-experimental-features=
 // DASH-NEXT: --use-explicit-namespace=