From 284d74fafb4bf7b0d9cd291c2be50185468797cb Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Sat, 29 Apr 2023 07:15:02 -0500 Subject: [PATCH 1/2] PR profiling: keep SQL file generated by igprof-analyze --- pr_testing/run-pr-profiling.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_testing/run-pr-profiling.sh b/pr_testing/run-pr-profiling.sh index ebc75c0db38b..9471fb1c5f00 100755 --- a/pr_testing/run-pr-profiling.sh +++ b/pr_testing/run-pr-profiling.sh @@ -93,7 +93,7 @@ for PROFILING_WORKFLOW in $WORKFLOWS;do AMP="&" echo "
  • $BASENAME
  • " >> $WORKSPACE/upload/profiling/index-$PROFILING_WORKFLOW.html done - for f in $(find $PROFILING_WORKFLOW -type f -name '*.log' -o -name '*.txt') ; do + for f in $(find $PROFILING_WORKFLOW -type f -name '*.log' -o -name '*.txt' -o -name '*.tmp') ; do d=$(dirname $f) mkdir -p $WORKSPACE/upload/profiling/$d || true cp -p $f $WORKSPACE/upload/profiling/$d/ || true From f7fa46a71edafc511030f1b16d42f266eb165645 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Sat, 29 Apr 2023 07:27:43 -0500 Subject: [PATCH 2/2] profile_igpp.sh and profile_igmp.sh are no longer generated every time --- pr_testing/run-pr-profiling.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pr_testing/run-pr-profiling.sh b/pr_testing/run-pr-profiling.sh index 9471fb1c5f00..7724ffbd61ce 100755 --- a/pr_testing/run-pr-profiling.sh +++ b/pr_testing/run-pr-profiling.sh @@ -41,8 +41,8 @@ for PROFILING_WORKFLOW in $WORKFLOWS;do continue fi pushd $WORKSPACE/$CMSSW_VERSION/$PROFILING_WORKFLOW - ./profile_igpp.sh $CMSSW_VERSION || true - ./profile_igmp.sh $CMSSW_VERSION || true + $WORKSPACE/profiling/Gen_tool/profile_igpp.sh $CMSSW_VERSION || true + $WORKSPACE/profiling/Gen_tool/profile_igmp.sh $CMSSW_VERSION || true echo "
  • $PROFILING_WORKFLOW/
  • " >> $WORKSPACE/upload/profiling/index-$PROFILING_WORKFLOW.html get_jenkins_artifacts igprof/${CMSSW_VERSION}/${SCRAM_ARCH}/profiling/${PROFILING_WORKFLOW}/RES_CPU_step3.txt ${CMSSW_VERSION}_RES_CPU_step3.txt || true $WORKSPACE/profiling/Analyze_tool/compare_cpu_txt.py --old ${CMSSW_VERSION}_RES_CPU_step3.txt --new RES_CPU_step3.txt > RES_CPU_compare_$PROFILING_WORKFLOW.txt || true