From patchwork Tue Dec 6 07:13:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 86701 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1885869qgi; Mon, 5 Dec 2016 23:35:16 -0800 (PST) X-Received: by 10.99.4.213 with SMTP id 204mr109909441pge.77.1481009716190; Mon, 05 Dec 2016 23:35:16 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d78si18380945pfk.190.2016.12.05.23.35.15; Mon, 05 Dec 2016 23:35:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752110AbcLFHfN (ORCPT + 25 others); Tue, 6 Dec 2016 02:35:13 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:31144 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbcLFHfL (ORCPT ); Tue, 6 Dec 2016 02:35:11 -0500 Received: from 172.24.1.137 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.137]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DWD25517; Tue, 06 Dec 2016 15:14:16 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Tue, 6 Dec 2016 15:14:07 +0800 From: Wang Nan To: CC: , , Wang Nan , Arnaldo Carvalho de Melo , "Alexei Starovoitov" , He Kuang , Jiri Olsa , Zefan Li , Subject: [PATCH v4 05/18] perf clang: Pass CFLAGS to builtin clang Date: Tue, 6 Dec 2016 07:13:43 +0000 Message-ID: <20161206071356.5312-6-wangnan0@huawei.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161206071356.5312-1-wangnan0@huawei.com> References: <20161206071356.5312-1-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Pass -DLINUX_VERSION_CODE, -D__NR_CPUS__, llvm.clang-opt config options and CFLAGS detected by kbuild detector to builtin clang so BPF scripts can use kernel headers and user defined options like external clang compiler. Test: # perf record -v --dry-run -e tools/perf/tests/bpf-script-test-kbuild.c ls 2>&1 | grep built bpf: builtin compiling successful Committer notes: Before installing the required clang/llvm devel files to have it builtin: # perf record -v --dry-run -e tools/perf/tests/bpf-script-test-kbuild.c ls 2>&1 | grep built bpf: builtin compiling failed: -95, try external compiler I.e. it falls back to using the external compiler. Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/util/c++/clang.cpp | 105 ++++++++++++++++++++++++++++++++++++++++-- tools/perf/util/llvm-utils.h | 9 +++- 2 files changed, 109 insertions(+), 5 deletions(-) -- 2.10.1 diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp index 340c948..6308aaf 100644 --- a/tools/perf/util/c++/clang.cpp +++ b/tools/perf/util/c++/clang.cpp @@ -27,6 +27,8 @@ #include "clang.h" #include "clang-c.h" +#include "llvm-utils.h" +#include "util-cxx.h" namespace perf { @@ -144,6 +146,101 @@ getBPFObjectFromModule(llvm::Module *Module) return std::move(Buffer); } +class ClangOptions { + llvm::SmallString FileName; + llvm::SmallString<64> KVerDef; + llvm::SmallString<64> NRCpusDef; + char *kbuild_dir; + char *kbuild_include_opts; + char *clang_opt; +public: + ClangOptions(const char *filename) : FileName(filename), + KVerDef(""), + NRCpusDef(""), + kbuild_dir(NULL), + kbuild_include_opts(NULL), + clang_opt(NULL) + { + llvm::sys::fs::make_absolute(FileName); + + unsigned int kver; + if (!fetch_kernel_version(&kver, NULL, 0)) + KVerDef = "-DLINUX_VERSION_CODE=" + std::to_string(kver); + + int nr_cpus = llvm__get_nr_cpus(); + if (nr_cpus > 0) + NRCpusDef = "-D__NR_CPUS__=" + std::to_string(nr_cpus); + + if (llvm_param.clang_opt) + clang_opt = strdup(llvm_param.clang_opt); + + llvm__get_kbuild_opts(&kbuild_dir, &kbuild_include_opts); + if (!kbuild_dir || !kbuild_include_opts) { + free(kbuild_dir); + free(kbuild_include_opts); + kbuild_dir = kbuild_include_opts = NULL; + } + } + + ~ClangOptions() + { + free(kbuild_dir); + free(kbuild_include_opts); + free(clang_opt); + } + + static void fillCFlagsFromString(opt::ArgStringList &CFlags, char *s, bool check = false) + { + if (!s) + return; + + SmallVector Terms; + StringRef Opts(s); + Opts.split(Terms, ' '); + + for (auto i = Terms.begin(); i != Terms.end(); i++) + s[i->end() - Opts.begin()] = '\0'; + + for (auto i = Terms.begin(); i != Terms.end(); i++) { + if (!check) { + CFlags.push_back(i->begin()); + continue; + } + + if (i->startswith("-I")) + CFlags.push_back(i->begin()); + else if (i->startswith("-D")) + CFlags.push_back(i->begin()); + else if (*i == "-include") { + CFlags.push_back((i++)->begin()); + /* Let clang report this error */ + if (i == Terms.end()) + break; + CFlags.push_back(i->begin()); + } + } + } + + void getCFlags(opt::ArgStringList &CFlags) + { + CFlags.push_back(KVerDef.c_str()); + CFlags.push_back(NRCpusDef.c_str()); + + fillCFlagsFromString(CFlags, clang_opt); + fillCFlagsFromString(CFlags, kbuild_include_opts, true); + + if (kbuild_dir) { + CFlags.push_back("-working-directory"); + CFlags.push_back(kbuild_dir); + } + } + + const char *getFileName(void) + { + return FileName.c_str(); + } +}; + } extern "C" { @@ -171,11 +268,11 @@ int perf_clang__compile_bpf(const char *_filename, if (!p_obj_buf || !p_obj_buf_sz) return -EINVAL; - llvm::SmallString FileName(_filename); - llvm::sys::fs::make_absolute(FileName); - + ClangOptions Opts(_filename); llvm::opt::ArgStringList CFlags; - auto M = getModuleFromSource(std::move(CFlags), FileName.data()); + + Opts.getCFlags(CFlags); + auto M = getModuleFromSource(std::move(CFlags), Opts.getFileName()); if (!M) return -EINVAL; auto O = getBPFObjectFromModule(&*M); diff --git a/tools/perf/util/llvm-utils.h b/tools/perf/util/llvm-utils.h index c87a2a9..263a00d 100644 --- a/tools/perf/util/llvm-utils.h +++ b/tools/perf/util/llvm-utils.h @@ -5,7 +5,11 @@ #ifndef __LLVM_UTILS_H #define __LLVM_UTILS_H -#include "debug.h" +#ifdef __cplusplus +extern "C" { +#endif + +#include struct llvm_param { /* Path of clang executable */ @@ -56,4 +60,7 @@ void llvm__get_kbuild_opts(char **kbuild_dir, char **kbuild_include_opts); int llvm__get_nr_cpus(void); void llvm__dump_obj(const char *path, void *obj_buf, size_t size); +#ifdef __cplusplus +} +#endif #endif