Author: Craig Topper Date: 2023-04-29T15:04:55-07:00 New Revision: ee9cbe3548cded885c6409d6dd8a616b515a06d3
URL: https://github.com/llvm/llvm-project/commit/ee9cbe3548cded885c6409d6dd8a616b515a06d3 DIFF: https://github.com/llvm/llvm-project/commit/ee9cbe3548cded885c6409d6dd8a616b515a06d3.diff LOG: [RISCV] Move RISCV::RVVBitsPerBlock from TargetParser to Support/RISCVISAInfo.h. RISCVTargetParser.h has a dependency on a tablegen generated file. Using RISCVISAInfo.h instead avoids this dependency. We just need this constant somewhere visible to the frontend and backend and I'm trying to avoid adding a header just for it. Added: Modified: clang/lib/AST/ASTContext.cpp clang/lib/AST/Type.cpp clang/lib/CodeGen/TargetInfo.cpp clang/lib/Driver/SanitizerArgs.cpp clang/lib/Sema/CMakeLists.txt clang/lib/Sema/SemaType.cpp llvm/include/llvm/Support/RISCVISAInfo.h llvm/include/llvm/TargetParser/RISCVTargetParser.h llvm/lib/Target/RISCV/RISCVISelLowering.h Removed: ################################################################################ diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index 3a72c3d257944..c04b056cba78f 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -85,7 +85,7 @@ #include "llvm/Support/MD5.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/TargetParser/RISCVTargetParser.h" +#include "llvm/Support/RISCVISAInfo.h" #include "llvm/TargetParser/Triple.h" #include <algorithm> #include <cassert> diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp index ed481a4c06962..20282c08afab5 100644 --- a/clang/lib/AST/Type.cpp +++ b/clang/lib/AST/Type.cpp @@ -46,7 +46,7 @@ #include "llvm/Support/Casting.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" -#include "llvm/TargetParser/RISCVTargetParser.h" +#include "llvm/Support/RISCVISAInfo.h" #include <algorithm> #include <cassert> #include <cstdint> diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp index ff4d516090ea4..7f02621777004 100644 --- a/clang/lib/CodeGen/TargetInfo.cpp +++ b/clang/lib/CodeGen/TargetInfo.cpp @@ -33,7 +33,7 @@ #include "llvm/IR/Type.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/TargetParser/RISCVTargetParser.h" +#include "llvm/Support/RISCVISAInfo.h" #include "llvm/TargetParser/Triple.h" #include <algorithm> diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index 8fe8ef2265c99..1aadc67a2d0cb 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -19,7 +19,6 @@ #include "llvm/Support/SpecialCaseList.h" #include "llvm/Support/VirtualFileSystem.h" #include "llvm/TargetParser/AArch64TargetParser.h" -#include "llvm/TargetParser/RISCVTargetParser.h" #include "llvm/TargetParser/TargetParser.h" #include "llvm/Transforms/Instrumentation/AddressSanitizerOptions.h" #include <memory> diff --git a/clang/lib/Sema/CMakeLists.txt b/clang/lib/Sema/CMakeLists.txt index 843a269dac720..629fafadcf9f4 100644 --- a/clang/lib/Sema/CMakeLists.txt +++ b/clang/lib/Sema/CMakeLists.txt @@ -71,7 +71,6 @@ add_clang_library(clangSema DEPENDS ClangOpenCLBuiltinsImpl omp_gen - RISCVTargetParserTableGen LINK_LIBS clangAST diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index 19a41b022ecda..6442d3182b85b 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -40,7 +40,7 @@ #include "llvm/ADT/SmallString.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/TargetParser/RISCVTargetParser.h" +#include "llvm/Support/RISCVISAInfo.h" #include <bitset> #include <optional> diff --git a/llvm/include/llvm/Support/RISCVISAInfo.h b/llvm/include/llvm/Support/RISCVISAInfo.h index 6eb085c32b5b2..1a260e93b64a9 100644 --- a/llvm/include/llvm/Support/RISCVISAInfo.h +++ b/llvm/include/llvm/Support/RISCVISAInfo.h @@ -22,6 +22,11 @@ struct RISCVExtensionInfo { unsigned MinorVersion; }; +namespace RISCV { +// We use 64 bits as the known part in the scalable vector types. +static constexpr unsigned RVVBitsPerBlock = 64; +} + class RISCVISAInfo { public: RISCVISAInfo(const RISCVISAInfo &) = delete; diff --git a/llvm/include/llvm/TargetParser/RISCVTargetParser.h b/llvm/include/llvm/TargetParser/RISCVTargetParser.h index 993f653455a0d..83effbc184897 100644 --- a/llvm/include/llvm/TargetParser/RISCVTargetParser.h +++ b/llvm/include/llvm/TargetParser/RISCVTargetParser.h @@ -15,17 +15,11 @@ #define LLVM_TARGETPARSER_RISCVTARGETPARSER_H #include "llvm/ADT/StringRef.h" -#include <vector> namespace llvm { -class Triple; - namespace RISCV { -// We use 64 bits as the known part in the scalable vector types. -static constexpr unsigned RVVBitsPerBlock = 64; - enum CPUKind : unsigned { #define PROC(ENUM, NAME, DEFAULT_MARCH) CK_##ENUM, #define TUNE_PROC(ENUM, NAME) CK_##ENUM, diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.h b/llvm/lib/Target/RISCV/RISCVISelLowering.h index 849b11f5b0006..65881f8204a6b 100644 --- a/llvm/lib/Target/RISCV/RISCVISelLowering.h +++ b/llvm/lib/Target/RISCV/RISCVISelLowering.h @@ -18,7 +18,6 @@ #include "llvm/CodeGen/CallingConvLower.h" #include "llvm/CodeGen/SelectionDAG.h" #include "llvm/CodeGen/TargetLowering.h" -#include "llvm/TargetParser/RISCVTargetParser.h" #include <optional> namespace llvm { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
