From 88383f18f3a693f9ea02733c680a32961e038b1e Mon Sep 17 00:00:00 2001 From: Ties Stuij Date: Mon, 27 Mar 2023 16:31:50 +0100 Subject: [PATCH] [llvm-exegesis] if lit can't find llvm-exegesis, fail gracefully currently in can_use_perfcounters() in llvm/test/tools/llvm-exegesis/lit.local.cfg, we check if we can execute llvm-exegesis. But we don't check if we did actually find llvm-exegesis. If we didn't, lit.util.which() will return None, and we try to execute that. Reviewed By: courbet Differential Revision: https://reviews.llvm.org/D146964 --- llvm/test/tools/llvm-exegesis/lit.local.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/llvm/test/tools/llvm-exegesis/lit.local.cfg b/llvm/test/tools/llvm-exegesis/lit.local.cfg index a932f32..22b0160 100644 --- a/llvm/test/tools/llvm-exegesis/lit.local.cfg +++ b/llvm/test/tools/llvm-exegesis/lit.local.cfg @@ -14,6 +14,9 @@ def can_use_perf_counters(mode, extra_options=[]): # only know that at runtime, so we try to measure an empty code snippet # and bail out on error. llvm_exegesis_exe = lit.util.which('llvm-exegesis', config.llvm_tools_dir) + if llvm_exegesis_exe is None: + print('could not find llvm-exegesis') + return False try: return_code = subprocess.call( [llvm_exegesis_exe, '-mode', mode, '-snippets-file', '/dev/null'] + extra_options, -- 2.7.4