From patchwork Tue Nov 15 04:06:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 82232 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1341312qge; Mon, 14 Nov 2016 20:10:54 -0800 (PST) X-Received: by 10.98.64.195 with SMTP id f64mr42651588pfd.16.1479183054510; Mon, 14 Nov 2016 20:10:54 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c190si24832269pfg.142.2016.11.14.20.10.54; Mon, 14 Nov 2016 20:10:54 -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 S966000AbcKOEI0 (ORCPT + 26 others); Mon, 14 Nov 2016 23:08:26 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:25281 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965911AbcKOEIS (ORCPT ); Mon, 14 Nov 2016 23:08:18 -0500 Received: from 172.24.1.36 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.1.36]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CLJ01978; Tue, 15 Nov 2016 12:08:09 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by SZXEML429-HUB.china.huawei.com (10.82.67.184) with Microsoft SMTP Server id 14.3.235.1; Tue, 15 Nov 2016 12:08:02 +0800 From: Wang Nan To: , CC: , , , , Wang Nan , Jiri Olsa Subject: [PATCH 22/34] perf clang jit: Wrap llvm::Module using PerfModule Date: Tue, 15 Nov 2016 04:06:05 +0000 Message-ID: <20161115040617.69788-23-wangnan0@huawei.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161115040617.69788-1-wangnan0@huawei.com> References: <20161115040617.69788-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 Use PerfModule wrap llvm::Module and return perf::PerfModule in APIs to replace llvm::Module. Following commits are going to add new functions to PerfModule. getBPFObjectFromModule is merged to a method of perf::PerfModule. 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-test.cpp | 10 +++++----- tools/perf/util/c++/clang.cpp | 20 +++++++++++++------- tools/perf/util/c++/clang.h | 22 ++++++++++++++++------ 3 files changed, 34 insertions(+), 18 deletions(-) -- 2.10.1 diff --git a/tools/perf/util/c++/clang-test.cpp b/tools/perf/util/c++/clang-test.cpp index 9b11e8c..fb05e56 100644 --- a/tools/perf/util/c++/clang-test.cpp +++ b/tools/perf/util/c++/clang-test.cpp @@ -13,18 +13,18 @@ public: ~perf_clang_scope() {perf_clang__cleanup();} }; -static std::unique_ptr +static std::unique_ptr __test__clang_to_IR(void) { unsigned int kernel_version; if (fetch_kernel_version(&kernel_version, NULL, 0)) - return std::unique_ptr(nullptr); + return std::unique_ptr(nullptr); std::string cflag_kver("-DLINUX_VERSION_CODE=" + std::to_string(kernel_version)); - std::unique_ptr M = + std::unique_ptr M = perf::getModuleFromSource({cflag_kver.c_str()}, "perf-test.c", test_llvm__bpf_base_prog); @@ -39,7 +39,7 @@ int test__clang_to_IR(void) auto M = __test__clang_to_IR(); if (!M) return -1; - for (llvm::Function& F : *M) + for (llvm::Function& F : *(M->getModule())) if (F.getName() == "bpf_func__SyS_epoll_wait") return 0; return -1; @@ -53,7 +53,7 @@ int test__clang_to_obj(void) if (!M) return -1; - auto Buffer = perf::getBPFObjectFromModule(&*M); + auto Buffer = M->toBPFObject(); if (!Buffer) return -1; return 0; diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp index 3a3b9791..d31b0a5 100644 --- a/tools/perf/util/c++/clang.cpp +++ b/tools/perf/util/c++/clang.cpp @@ -64,7 +64,7 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path, return CI; } -static std::unique_ptr +static std::unique_ptr getModuleFromSource(llvm::opt::ArgStringList CFlags, StringRef Path, IntrusiveRefCntPtr VFS) { @@ -80,12 +80,12 @@ getModuleFromSource(llvm::opt::ArgStringList CFlags, std::unique_ptr Act(new EmitLLVMOnlyAction(&*LLVMCtx)); if (!Clang.ExecuteAction(*Act)) - return std::unique_ptr(nullptr); + return std::unique_ptr(nullptr); - return Act->takeModule(); + return std::unique_ptr(new PerfModule(std::move(Act->takeModule()))); } -std::unique_ptr +std::unique_ptr getModuleFromSource(llvm::opt::ArgStringList CFlags, StringRef Name, StringRef Content) { @@ -106,15 +106,21 @@ getModuleFromSource(llvm::opt::ArgStringList CFlags, return getModuleFromSource(std::move(CFlags), Name, OverlayFS); } -std::unique_ptr +std::unique_ptr getModuleFromSource(llvm::opt::ArgStringList CFlags, StringRef Path) { IntrusiveRefCntPtr VFS(vfs::getRealFileSystem()); return getModuleFromSource(std::move(CFlags), Path, VFS); } +PerfModule::PerfModule(std::unique_ptr&& M) : Module(std::move(M)) +{ + +} + + std::unique_ptr> -getBPFObjectFromModule(llvm::Module *Module) +PerfModule::toBPFObject(void) { using namespace llvm; @@ -278,7 +284,7 @@ int perf_clang__compile_bpf(const char *_filename, auto M = getModuleFromSource(std::move(CFlags), Opts.getFileName()); if (!M) return -EINVAL; - auto O = getBPFObjectFromModule(&*M); + auto O = M->toBPFObject(); if (!O) return -EINVAL; diff --git a/tools/perf/util/c++/clang.h b/tools/perf/util/c++/clang.h index dd8b042..cbb291b 100644 --- a/tools/perf/util/c++/clang.h +++ b/tools/perf/util/c++/clang.h @@ -11,16 +11,26 @@ namespace perf { using namespace llvm; -std::unique_ptr +class PerfModule { +private: + std::unique_ptr Module; +public: + inline llvm::Module *getModule(void) + { + return Module.get(); + } + + PerfModule(std::unique_ptr&& M); + + std::unique_ptr> toBPFObject(void); +}; + +std::unique_ptr getModuleFromSource(opt::ArgStringList CFlags, StringRef Name, StringRef Content); -std::unique_ptr +std::unique_ptr getModuleFromSource(opt::ArgStringList CFlags, StringRef Path); - -std::unique_ptr> -getBPFObjectFromModule(llvm::Module *Module); - } #endif