[PATCH] D36336: [X86] Add support for __builtin_cpu_init
This revision was automatically updated to reflect the committed changes. Closed by commit rL311874: [X86] Add support for __builtin_cpu_init (authored by ctopper). Changed prior to commit: https://reviews.llvm.org/D36336?vs=109800=112851#toc Repository: rL LLVM https://reviews.llvm.org/D36336 Files: cfe/trunk/include/clang/Basic/BuiltinsX86.def cfe/trunk/lib/CodeGen/CGBuiltin.cpp cfe/trunk/test/CodeGen/builtin-cpu-supports.c Index: cfe/trunk/lib/CodeGen/CGBuiltin.cpp === --- cfe/trunk/lib/CodeGen/CGBuiltin.cpp +++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp @@ -7404,9 +7404,6 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID, const CallExpr *E) { - if (BuiltinID == X86::BI__builtin_cpu_is) -return EmitX86CpuIs(*this, E); - SmallVectorOps; // Find out if any arguments are required to be integer constant expressions. @@ -7457,6 +7454,15 @@ switch (BuiltinID) { default: return nullptr; + case X86::BI__builtin_cpu_init: { +llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, + /*Variadic*/false); +llvm::Constant *Func = CGM.CreateRuntimeFunction(FTy, + "__cpu_indicator_init"); +return Builder.CreateCall(Func); + } + case X86::BI__builtin_cpu_is: +return EmitX86CpuIs(*this, E); case X86::BI__builtin_cpu_supports: { const Expr *FeatureExpr = E->getArg(0)->IgnoreParenCasts(); StringRef FeatureStr = cast(FeatureExpr)->getString(); Index: cfe/trunk/include/clang/Basic/BuiltinsX86.def === --- cfe/trunk/include/clang/Basic/BuiltinsX86.def +++ cfe/trunk/include/clang/Basic/BuiltinsX86.def @@ -32,6 +32,7 @@ // Miscellaneous builtin for checking x86 cpu features. // TODO: Make this somewhat generic so that other backends // can use it? +BUILTIN(__builtin_cpu_init, "v", "n") BUILTIN(__builtin_cpu_supports, "bcC*", "nc") BUILTIN(__builtin_cpu_is, "bcC*", "nc") Index: cfe/trunk/test/CodeGen/builtin-cpu-supports.c === --- cfe/trunk/test/CodeGen/builtin-cpu-supports.c +++ cfe/trunk/test/CodeGen/builtin-cpu-supports.c @@ -5,6 +5,10 @@ extern void a(const char *); int main() { + __builtin_cpu_init(); + + // CHECK: call void @__cpu_indicator_init + if (__builtin_cpu_supports("sse4.2")) a("sse4.2"); Index: cfe/trunk/lib/CodeGen/CGBuiltin.cpp === --- cfe/trunk/lib/CodeGen/CGBuiltin.cpp +++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp @@ -7404,9 +7404,6 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID, const CallExpr *E) { - if (BuiltinID == X86::BI__builtin_cpu_is) -return EmitX86CpuIs(*this, E); - SmallVector Ops; // Find out if any arguments are required to be integer constant expressions. @@ -7457,6 +7454,15 @@ switch (BuiltinID) { default: return nullptr; + case X86::BI__builtin_cpu_init: { +llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, + /*Variadic*/false); +llvm::Constant *Func = CGM.CreateRuntimeFunction(FTy, + "__cpu_indicator_init"); +return Builder.CreateCall(Func); + } + case X86::BI__builtin_cpu_is: +return EmitX86CpuIs(*this, E); case X86::BI__builtin_cpu_supports: { const Expr *FeatureExpr = E->getArg(0)->IgnoreParenCasts(); StringRef FeatureStr = cast(FeatureExpr)->getString(); Index: cfe/trunk/include/clang/Basic/BuiltinsX86.def === --- cfe/trunk/include/clang/Basic/BuiltinsX86.def +++ cfe/trunk/include/clang/Basic/BuiltinsX86.def @@ -32,6 +32,7 @@ // Miscellaneous builtin for checking x86 cpu features. // TODO: Make this somewhat generic so that other backends // can use it? +BUILTIN(__builtin_cpu_init, "v", "n") BUILTIN(__builtin_cpu_supports, "bcC*", "nc") BUILTIN(__builtin_cpu_is, "bcC*", "nc") Index: cfe/trunk/test/CodeGen/builtin-cpu-supports.c === --- cfe/trunk/test/CodeGen/builtin-cpu-supports.c +++ cfe/trunk/test/CodeGen/builtin-cpu-supports.c @@ -5,6 +5,10 @@ extern void a(const char *); int main() { + __builtin_cpu_init(); + + // CHECK: call void @__cpu_indicator_init + if (__builtin_cpu_supports("sse4.2")) a("sse4.2"); ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D36336: [X86] Add support for __builtin_cpu_init
echristo accepted this revision. echristo added a comment. This revision is now accepted and ready to land. One inline comment, but go ahead and commit after fixing that up. Comment at: lib/CodeGen/CGBuiltin.cpp:7292 const CallExpr *E) { + if (BuiltinID == X86::BI__builtin_cpu_init) { +llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, I realize it makes sense to put this here because it doesn't require the setup, but let's go ahead and just put it in the switch statement below. I don't think avoiding the bit of setup/etc below is worth the inconsistency. :) https://reviews.llvm.org/D36336 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D36336: [X86] Add support for __builtin_cpu_init
craig.topper added a comment. Ping https://reviews.llvm.org/D36336 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D36336: [X86] Add support for __builtin_cpu_init
craig.topper created this revision. This adds __builtin_cpu_init which will emit a call to __cpu_indicator_init in libgcc or compiler-rt. This is needed to support __builtin_cpu_supports/__builtin_cpu_is in an ifunc resolver. https://reviews.llvm.org/D36336 Files: include/clang/Basic/BuiltinsX86.def lib/CodeGen/CGBuiltin.cpp test/CodeGen/builtin-cpu-supports.c Index: test/CodeGen/builtin-cpu-supports.c === --- test/CodeGen/builtin-cpu-supports.c +++ test/CodeGen/builtin-cpu-supports.c @@ -5,6 +5,10 @@ extern void a(const char *); int main() { + __builtin_cpu_init(); + + // CHECK: call void @__cpu_indicator_init + if (__builtin_cpu_supports("sse4.2")) a("sse4.2"); Index: lib/CodeGen/CGBuiltin.cpp === --- lib/CodeGen/CGBuiltin.cpp +++ lib/CodeGen/CGBuiltin.cpp @@ -7289,6 +7289,13 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID, const CallExpr *E) { + if (BuiltinID == X86::BI__builtin_cpu_init) { +llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, + /*Variadic*/false); +llvm::Constant *Func = CGM.CreateRuntimeFunction(FTy, "__cpu_indicator_init"); +return Builder.CreateCall(Func); + } + SmallVectorOps; // Find out if any arguments are required to be integer constant expressions. Index: include/clang/Basic/BuiltinsX86.def === --- include/clang/Basic/BuiltinsX86.def +++ include/clang/Basic/BuiltinsX86.def @@ -32,6 +32,7 @@ // Miscellaneous builtin for checking x86 cpu features. // TODO: Make this somewhat generic so that other backends // can use it? +BUILTIN(__builtin_cpu_init, "v", "n") BUILTIN(__builtin_cpu_supports, "bcC*", "nc") // Undefined Values Index: test/CodeGen/builtin-cpu-supports.c === --- test/CodeGen/builtin-cpu-supports.c +++ test/CodeGen/builtin-cpu-supports.c @@ -5,6 +5,10 @@ extern void a(const char *); int main() { + __builtin_cpu_init(); + + // CHECK: call void @__cpu_indicator_init + if (__builtin_cpu_supports("sse4.2")) a("sse4.2"); Index: lib/CodeGen/CGBuiltin.cpp === --- lib/CodeGen/CGBuiltin.cpp +++ lib/CodeGen/CGBuiltin.cpp @@ -7289,6 +7289,13 @@ Value *CodeGenFunction::EmitX86BuiltinExpr(unsigned BuiltinID, const CallExpr *E) { + if (BuiltinID == X86::BI__builtin_cpu_init) { +llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, + /*Variadic*/false); +llvm::Constant *Func = CGM.CreateRuntimeFunction(FTy, "__cpu_indicator_init"); +return Builder.CreateCall(Func); + } + SmallVector Ops; // Find out if any arguments are required to be integer constant expressions. Index: include/clang/Basic/BuiltinsX86.def === --- include/clang/Basic/BuiltinsX86.def +++ include/clang/Basic/BuiltinsX86.def @@ -32,6 +32,7 @@ // Miscellaneous builtin for checking x86 cpu features. // TODO: Make this somewhat generic so that other backends // can use it? +BUILTIN(__builtin_cpu_init, "v", "n") BUILTIN(__builtin_cpu_supports, "bcC*", "nc") // Undefined Values ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits