[HIP] Fix --hip-version flag with 0 as component

[ashi1]

Summary

Allow the usage of minor version 0, for hip versions
such as 4.0. Change the default values when performing
version checks.

[ashi1]

clang/lib/Driver/ToolChains/AMDGPU.cpp

331–333

@yaxunl do you think we should allow Major version 0?

[yaxunl]

clang/lib/Driver/ToolChains/AMDGPU.cpp

148–149

I don't think we need to change this part.

319–321

is there any reason to use this number? can we just use ~0U ?

331–333

I think we should allow major==0 since 0.1 is a valid version number.

also we should allow --hip-version=4 and treat it as 4.0.0, i.e. if major is set but minor is missing, then minor is 0. and we need a test for that.

[ashi1]

Fixed to yaxunl's comments, using ~0U , and allowing major only component.

[yaxunl]

LGTM. Thanks.

clang/lib/Driver/ToolChains/AMDGPU.cpp

 }
 
 // Parse and extract version numbers from `.hipVersion`. Return `true` if
 // the parsing fails.
 bool RocmInstallationDetector::parseHIPVersionFile(llvm::StringRef V) {
   SmallVector<StringRef, 4> VersionParts;
   V.split(VersionParts, '\n');
   unsigned Major = ~0U;
   unsigned Minor = ~0U;
   for (auto Part : VersionParts) {
     auto Splits = Part.rtrim().split('=');
     if (Splits.first == "HIP_VERSION_MAJOR") {
       if (Splits.second.getAsInteger(0, Major))
         return true;
     } else if (Splits.first == "HIP_VERSION_MINOR") {
       if (Splits.second.getAsInteger(0, Minor))
         return true;
     } else if (Splits.first == "HIP_VERSION_PATCH")
RocmInstallationDetector::RocmInstallationDetector(
   RocmPathArg = Args.getLastArgValue(clang::driver::options::OPT_rocm_path_EQ);
   PrintROCmSearchDirs =
       Args.hasArg(clang::driver::options::OPT_print_rocm_search_dirs);
   RocmDeviceLibPathArg =
       Args.getAllArgValues(clang::driver::options::OPT_rocm_device_lib_path_EQ);
   HIPPathArg = Args.getLastArgValue(clang::driver::options::OPT_hip_path_EQ);
   if (auto *A = Args.getLastArg(clang::driver::options::OPT_hip_version_EQ)) {
     HIPVersionArg = A->getValue();
-    unsigned Major = 0;
-    unsigned Minor = 0;
+    unsigned Major = ~0U;
+    unsigned Minor = ~0U;
     SmallVector<StringRef, 3> Parts;
     HIPVersionArg.split(Parts, '.');
     if (Parts.size())
       Parts[0].getAsInteger(0, Major);
     if (Parts.size() > 1)
       Parts[1].getAsInteger(0, Minor);
     if (Parts.size() > 2)
       VersionPatch = Parts[2].str();
     if (VersionPatch.empty())
       VersionPatch = "0";
-    if (Major == 0 || Minor == 0)
+    if (Major != ~0U && Minor == ~0U)
+      Minor = 0;
+    if (Major == ~0U || Minor == ~0U)
       D.Diag(diag::err_drv_invalid_value)
           << A->getAsString(Args) << HIPVersionArg;
 
     VersionMajorMinor = llvm::VersionTuple(Major, Minor);
     DetectedVersion =
         (Twine(Major) + "." + Twine(Minor) + "." + VersionPatch).str();
   } else {
     VersionPatch = DefaultVersionPatch;

clang/test/Driver/hip-version.hip

 
 // SPECIFIED: Found HIP installation: {{.*Driver}}, version 3.7.0
 
 // RUN: %clang -v --rocm-path=%S --hip-version=3.7 2>&1 \
 // RUN:   | FileCheck -check-prefixes=SPECIFIED2 %s
 
 // SPECIFIED2: Found HIP installation: {{.*Driver}}, version 3.7.0
 
+// RUN: %clang -v --rocm-path=%S --hip-version=4.0.21025 2>&1 \
+// RUN:   | FileCheck -check-prefixes=SPECIFIED3 %s
+
+// SPECIFIED3: Found HIP installation: {{.*Driver}}, version 4.0.21025
+
+// RUN: %clang -v --rocm-path=%S --hip-version=4 2>&1 \
+// RUN:   | FileCheck -check-prefixes=SPECIFIED4 %s
+
+// SPECIFIED4: Found HIP installation: {{.*Driver}}, version 4.0.0
+
 // RUN: not %clang -v --rocm-path=%S --hip-version=x.y 2>&1 \
 // RUN:   | FileCheck -check-prefixes=INVALID %s
 
 // INVALID: error: invalid value 'x.y' in '--hip-version=x.y'