From 44aa7e25dd4168d12f6fbe9a3ef6d5dde662ff1e Mon Sep 17 00:00:00 2001 From: suijingfeng Date: Mon, 19 Jul 2021 23:06:48 +0800 Subject: [PATCH] llvmpipe: correct the debug information printed with GALLIVM_PERF=nopt GALLIVM_PERF_NO_OPT is "belond" to GALLIVM_PERF environment variable, not GALLIVM_DEBUG. when GALLIVM_PERF=nopt is passed to llvmpipe, "-sroa -early-cse -simplifycfg -reassociate -constprop -instcombine -gvn" should not be printed. Those llvm optimation techniques should only be printed when the default(-O2) optimation is enabled. $ GALLIVM_PERF=nopt GALLIVM_DEBUG=dumpbc glmark2 Before apply this patch: Invoke as "opt -sroa -early-cse -simplifycfg -reassociate -mem2reg -constprop -instcombine -gvn ir_setup_variant_0.bc | llc -O2 [-mcpu=<-mcpu option>] [-mattr=<-mattr option(s)>]" After apply this patch: Invoke as "opt -mem2reg ir_fs304_variant0.bc | llc -O0 [-mcpu=<-mcpu option>] [-mattr=<-mattr option(s)>]" Reviewed-by: Adam Jackson Reviewed-by: Roland Scheidegger Signed-off-by: suijingfeng Part-of: --- src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c index d2d049a..6cb04e2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c @@ -595,10 +595,10 @@ gallivm_compile_module(struct gallivm_state *gallivm) LLVMWriteBitcodeToFile(gallivm->module, filename); debug_printf("%s written\n", filename); debug_printf("Invoke as \"opt %s %s | llc -O%d %s%s\"\n", - gallivm_debug & GALLIVM_PERF_NO_OPT ? "-mem2reg" : + gallivm_perf & GALLIVM_PERF_NO_OPT ? "-mem2reg" : "-sroa -early-cse -simplifycfg -reassociate " "-mem2reg -constprop -instcombine -gvn", - filename, gallivm_debug & GALLIVM_PERF_NO_OPT ? 0 : 2, + filename, gallivm_perf & GALLIVM_PERF_NO_OPT ? 0 : 2, "[-mcpu=<-mcpu option>] ", "[-mattr=<-mattr option(s)>]"); } -- 2.7.4