[NFC][RISCV] Extract utility to calculate value through MajorVersion and MinorVersion

[eopXD]

I don't have preference to this, just doing this out of Jessica's comment in D138930.

[asb]

llvm/include/llvm/Support/RISCVISAInfo.h

25 ↗

(On Diff #478982)

Would this be better as return getVersionValue(MajorVersion, MinorVersion); in order to maximise logic reuse?

[jrtc27]

Should this live in RISCVISAInfo.h rather than be a Clang-specific thing given it's just for squeezing version info into the preprocessor? I can't think of a use for it outside that at the moment.

[eopXD]

In D139025#3961214, @jrtc27 wrote:

Should this live in RISCVISAInfo.h rather than be a Clang-specific thing given it's just for squeezing version info into the preprocessor? I can't think of a use for it outside that at the moment.

This patch has the version value calculation in RISCVISAInfo.h, so sorry I don't quite get what you mean. Do you mean specifically __riscv_v_intrinsic macro?

If you mean to have macro information under the RISCVExtensionInfo, I don't see the need here as there are macro like __riscv_v_min_vlen that can be implied by multiple macro-s.

[craig.topper]

In D139025#3961990, @eopXD wrote:

In D139025#3961214, @jrtc27 wrote:

Should this live in RISCVISAInfo.h rather than be a Clang-specific thing given it's just for squeezing version info into the preprocessor? I can't think of a use for it outside that at the moment.

This patch has the version value calculation in RISCVISAInfo.h, so sorry I don't quite get what you mean. Do you mean specifically __riscv_v_intrinsic macro?

If you mean to have macro information under the RISCVExtensionInfo, I don't see the need here as there are macro like __riscv_v_min_vlen that can be implied by multiple macro-s.

I think the suggestion was that it didn’t need to be in RISCVISAInfo.h because it is a never used outside of RISCV.cpp. So it could just be a static function in the cpp file.

[eopXD]

Address comment from Jessica, thanks Craig for explaining.

[eopXD]

llvm/include/llvm/Support/RISCVISAInfo.h

25 ↗

(On Diff #478982)

Reuse no longer needed here.

[eopXD]

Ping.

[craig.topper]

LGTM

clang/lib/Basic/Targets/RISCV.cpp

case 'v':
     break;
   default:
     R = TargetInfo::convertConstraint(Constraint);
     break;
   }
   return R;
 }
 
+static unsigned getVersionValue(unsigned MajorVersion, unsigned MinorVersion) {
+  return MajorVersion * 1000000 + MinorVersion * 1000;
+}
+
 void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
                                        MacroBuilder &Builder) const {
   Builder.defineMacro("__ELF__");
   Builder.defineMacro("__riscv");
   bool Is64Bit = getTriple().getArch() == llvm::Triple::riscv64;
   Builder.defineMacro("__riscv_xlen", Is64Bit ? "64" : "32");
   StringRef CodeModel = getTargetOpts().CodeModel;
   unsigned FLen = ISAInfo->getFLen();
void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
   if (ABIName == "ilp32e")
     Builder.defineMacro("__riscv_abi_rve");
 
   Builder.defineMacro("__riscv_arch_test");
 
   for (auto &Extension : ISAInfo->getExtensions()) {
     auto ExtName = Extension.first;
     auto ExtInfo = Extension.second;
-    unsigned Version =
-        (ExtInfo.MajorVersion * 1000000) + (ExtInfo.MinorVersion * 1000);
 
-    Builder.defineMacro(Twine("__riscv_", ExtName), Twine(Version));
+    Builder.defineMacro(
+        Twine("__riscv_", ExtName),
+        Twine(getVersionValue(ExtInfo.MajorVersion, ExtInfo.MinorVersion)));
   }
 
   if (ISAInfo->hasExtension("m") || ISAInfo->hasExtension("zmmul"))
     Builder.defineMacro("__riscv_mul");
 
   if (ISAInfo->hasExtension("m")) {
     Builder.defineMacro("__riscv_div");
     Builder.defineMacro("__riscv_muldiv");
void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
   }
 
   if (ISAInfo->hasExtension("c"))
     Builder.defineMacro("__riscv_compressed");
 
   if (ISAInfo->hasExtension("zve32x")) {
     Builder.defineMacro("__riscv_vector");
     // Currently we support the v0.10 RISC-V V intrinsics.
-    unsigned Version = (0 * 1000000) + (10 * 1000);
-    Builder.defineMacro("__riscv_v_intrinsic", Twine(Version));
+    Builder.defineMacro("__riscv_v_intrinsic", Twine(getVersionValue(0, 10)));
   }
 }
 
 const Builtin::Info RISCVTargetInfo::BuiltinInfo[] = {
 #define BUILTIN(ID, TYPE, ATTRS)                                               \
   {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
 #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
     {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},