From ed34140e1146e188686f479bd954dea11a2d26d8 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 10 Jun 2020 21:25:15 -0700 Subject: [PATCH] [X86] Move X86 stuff out of TargetParser.h and into the recently created X86TargetParser.h. NFC --- clang/lib/Basic/Targets/X86.cpp | 2 +- clang/lib/CodeGen/CGBuiltin.cpp | 2 +- llvm/include/llvm/Support/TargetParser.h | 45 +---------------------------- llvm/include/llvm/Support/X86TargetParser.h | 39 +++++++++++++++++++++++++ llvm/lib/Support/Host.cpp | 2 +- 5 files changed, 43 insertions(+), 47 deletions(-) diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp index 05c6ec2..0092c52 100644 --- a/clang/lib/Basic/Targets/X86.cpp +++ b/clang/lib/Basic/Targets/X86.cpp @@ -17,7 +17,7 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/Support/TargetParser.h" +#include "llvm/Support/X86TargetParser.h" namespace clang { namespace targets { diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 010b77e..a2e6050 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -47,7 +47,7 @@ #include "llvm/IR/MatrixBuilder.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/ScopedPrinter.h" -#include "llvm/Support/TargetParser.h" +#include "llvm/Support/X86TargetParser.h" #include using namespace clang; diff --git a/llvm/include/llvm/Support/TargetParser.h b/llvm/include/llvm/Support/TargetParser.h index ef7c861..b60c1aff 100644 --- a/llvm/include/llvm/Support/TargetParser.h +++ b/llvm/include/llvm/Support/TargetParser.h @@ -25,55 +25,12 @@ namespace llvm { class StringRef; // Target specific information in their own namespaces. -// (ARM/AArch64 are declared in ARM/AArch64TargetParser.h) +// (ARM/AArch64/X86 are declared in ARM/AArch64/X86TargetParser.h) // These should be generated from TableGen because the information is already // there, and there is where new information about targets will be added. // FIXME: To TableGen this we need to make some table generated files available // even if the back-end is not compiled with LLVM, plus we need to create a new // back-end to TableGen to create these clean tables. -namespace X86 { - -// This should be kept in sync with libcc/compiler-rt as its included by clang -// as a proxy for what's in libgcc/compiler-rt. -enum ProcessorVendors : unsigned { - VENDOR_DUMMY, -#define X86_VENDOR(ENUM, STRING) \ - ENUM, -#include "llvm/Support/X86TargetParser.def" - VENDOR_OTHER -}; - -// This should be kept in sync with libcc/compiler-rt as its included by clang -// as a proxy for what's in libgcc/compiler-rt. -enum ProcessorTypes : unsigned { - CPU_TYPE_DUMMY, -#define X86_CPU_TYPE(ARCHNAME, ENUM) \ - ENUM, -#include "llvm/Support/X86TargetParser.def" - CPU_TYPE_MAX -}; - -// This should be kept in sync with libcc/compiler-rt as its included by clang -// as a proxy for what's in libgcc/compiler-rt. -enum ProcessorSubtypes : unsigned { - CPU_SUBTYPE_DUMMY, -#define X86_CPU_SUBTYPE(ARCHNAME, ENUM) \ - ENUM, -#include "llvm/Support/X86TargetParser.def" - CPU_SUBTYPE_MAX -}; - -// This should be kept in sync with libcc/compiler-rt as it should be used -// by clang as a proxy for what's in libgcc/compiler-rt. -enum ProcessorFeatures { -#define X86_FEATURE(VAL, ENUM) \ - ENUM = VAL, -#include "llvm/Support/X86TargetParser.def" - -}; - -} // namespace X86 - namespace AMDGPU { /// GPU kinds supported by the AMDGPU target. diff --git a/llvm/include/llvm/Support/X86TargetParser.h b/llvm/include/llvm/Support/X86TargetParser.h index 1c9ad03..7cdf1c5 100644 --- a/llvm/include/llvm/Support/X86TargetParser.h +++ b/llvm/include/llvm/Support/X86TargetParser.h @@ -20,6 +20,45 @@ class StringRef; namespace X86 { +// This should be kept in sync with libcc/compiler-rt as its included by clang +// as a proxy for what's in libgcc/compiler-rt. +enum ProcessorVendors : unsigned { + VENDOR_DUMMY, +#define X86_VENDOR(ENUM, STRING) \ + ENUM, +#include "llvm/Support/X86TargetParser.def" + VENDOR_OTHER +}; + +// This should be kept in sync with libcc/compiler-rt as its included by clang +// as a proxy for what's in libgcc/compiler-rt. +enum ProcessorTypes : unsigned { + CPU_TYPE_DUMMY, +#define X86_CPU_TYPE(ARCHNAME, ENUM) \ + ENUM, +#include "llvm/Support/X86TargetParser.def" + CPU_TYPE_MAX +}; + +// This should be kept in sync with libcc/compiler-rt as its included by clang +// as a proxy for what's in libgcc/compiler-rt. +enum ProcessorSubtypes : unsigned { + CPU_SUBTYPE_DUMMY, +#define X86_CPU_SUBTYPE(ARCHNAME, ENUM) \ + ENUM, +#include "llvm/Support/X86TargetParser.def" + CPU_SUBTYPE_MAX +}; + +// This should be kept in sync with libcc/compiler-rt as it should be used +// by clang as a proxy for what's in libgcc/compiler-rt. +enum ProcessorFeatures { +#define X86_FEATURE(VAL, ENUM) \ + ENUM = VAL, +#include "llvm/Support/X86TargetParser.def" + +}; + enum CPUKind { CK_None, #define PROC(ENUM, STRING, IS64BIT) CK_##ENUM, diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp index a3a0a4c..75b4082 100644 --- a/llvm/lib/Support/Host.cpp +++ b/llvm/lib/Support/Host.cpp @@ -21,7 +21,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/TargetParser.h" +#include "llvm/Support/X86TargetParser.h" #include "llvm/Support/raw_ostream.h" #include #include -- 2.7.4