eopXD created this revision. eopXD added a reviewer: jrtc27. Herald added subscribers: sunshaoce, VincentWu, vkmr, frasercrmck, evandro, luismarques, apazos, sameer.abuasal, s.egerton, Jim, benna, psnobl, jocewei, PkmX, the_o, brucehoult, MartinMosbeck, rogfer01, edward-jones, zzheng, shiva0217, kito-cheng, niosHD, sabuasal, simoncook, johnrusso, rbar, asb, arichardson. Herald added a project: All. eopXD requested review of this revision. Herald added subscribers: llvm-commits, cfe-commits, pcwang-thead, MaskRay. Herald added projects: clang, LLVM.
Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D139025 Files: clang/lib/Basic/Targets/RISCV.cpp llvm/include/llvm/Support/RISCVISAInfo.h Index: llvm/include/llvm/Support/RISCVISAInfo.h =================================================================== --- llvm/include/llvm/Support/RISCVISAInfo.h +++ llvm/include/llvm/Support/RISCVISAInfo.h @@ -21,6 +21,13 @@ std::string ExtName; unsigned MajorVersion; unsigned MinorVersion; + unsigned getVersionValue() { + return MajorVersion * 1000000 + MinorVersion * 1000; + } + static unsigned getVersionValue(unsigned MajorVersion, + unsigned MinorVersion) { + return MajorVersion * 1000000 + MinorVersion * 1000; + } }; class RISCVISAInfo { Index: clang/lib/Basic/Targets/RISCV.cpp =================================================================== --- clang/lib/Basic/Targets/RISCV.cpp +++ clang/lib/Basic/Targets/RISCV.cpp @@ -152,10 +152,9 @@ 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(ExtInfo.getVersionValue())); } if (ISAInfo->hasExtension("m") || ISAInfo->hasExtension("zmmul")) @@ -193,8 +192,9 @@ 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(llvm::RISCVExtensionInfo::getVersionValue(0, 10))); } }
Index: llvm/include/llvm/Support/RISCVISAInfo.h =================================================================== --- llvm/include/llvm/Support/RISCVISAInfo.h +++ llvm/include/llvm/Support/RISCVISAInfo.h @@ -21,6 +21,13 @@ std::string ExtName; unsigned MajorVersion; unsigned MinorVersion; + unsigned getVersionValue() { + return MajorVersion * 1000000 + MinorVersion * 1000; + } + static unsigned getVersionValue(unsigned MajorVersion, + unsigned MinorVersion) { + return MajorVersion * 1000000 + MinorVersion * 1000; + } }; class RISCVISAInfo { Index: clang/lib/Basic/Targets/RISCV.cpp =================================================================== --- clang/lib/Basic/Targets/RISCV.cpp +++ clang/lib/Basic/Targets/RISCV.cpp @@ -152,10 +152,9 @@ 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(ExtInfo.getVersionValue())); } if (ISAInfo->hasExtension("m") || ISAInfo->hasExtension("zmmul")) @@ -193,8 +192,9 @@ 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(llvm::RISCVExtensionInfo::getVersionValue(0, 10))); } }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits