From patchwork Fri Sep 23 12:50:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 76858 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp553367qgf; Fri, 23 Sep 2016 05:53:34 -0700 (PDT) X-Received: by 10.98.206.139 with SMTP id y133mr12234429pfg.7.1474635214342; Fri, 23 Sep 2016 05:53:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8si7824060pfg.248.2016.09.23.05.53.33; Fri, 23 Sep 2016 05:53:34 -0700 (PDT) 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 S1759721AbcIWMxa (ORCPT + 27 others); Fri, 23 Sep 2016 08:53:30 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:18951 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758922AbcIWMuw (ORCPT ); Fri, 23 Sep 2016 08:50:52 -0400 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 DRL70282; Fri, 23 Sep 2016 20:50:25 +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; Fri, 23 Sep 2016 20:50:14 +0800 From: Wang Nan To: , CC: , , , Wang Nan , Arnaldo Carvalho de Melo , He Kuang , Jiri Olsa Subject: [PATCH 13/14] perf clang: Pass fill path compiler Date: Fri, 23 Sep 2016 12:50:00 +0000 Message-ID: <1474635001-153850-14-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1474635001-153850-1-git-send-email-wangnan0@huawei.com> References: <1474635001-153850-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.57E52512.01A0, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 9c700583b7f74fb20eae246384d25845 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If clang changes its working directory, filename passed to perf_clang__compile_bpf() becomes invalid. Before running clang, convert it to absolute path so file can be found even working directory is different. Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa --- tools/perf/util/c++/clang.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp index 010b91e..812dd53 100644 --- a/tools/perf/util/c++/clang.cpp +++ b/tools/perf/util/c++/clang.cpp @@ -13,8 +13,10 @@ #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Tooling/Tooling.h" #include "clang/CodeGen/CodeGenAction.h" +#include "llvm/ADT/SmallString.h" #include "llvm/IR/Module.h" #include "llvm/Option/Option.h" +#include "llvm/Support/FileSystem.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Target/TargetMachine.h" @@ -164,7 +166,7 @@ void perf_clang__cleanup(void) llvm::llvm_shutdown(); } -int perf_clang__compile_bpf(const char *filename, +int perf_clang__compile_bpf(const char *_filename, void **p_obj_buf, size_t *p_obj_buf_sz) { @@ -173,8 +175,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); + llvm::opt::ArgStringList CFlags; - auto M = getModuleFromSource(std::move(CFlags), filename); + auto M = getModuleFromSource(std::move(CFlags), FileName.data()); if (!M) return -EINVAL; auto O = getBPFObjectFromModule(&*M);