diff --git a/bolt/test/link_fdata.py b/bolt/test/link_fdata.py index 898dce8e3fb5f..0361500ae7194 100755 --- a/bolt/test/link_fdata.py +++ b/bolt/test/link_fdata.py @@ -27,7 +27,7 @@ # Regexes to extract FDATA lines from input and parse FDATA and pre-aggregated # profile data -prefix_pat = re.compile(f"^# {args.prefix}: (.*)") +prefix_pat = re.compile(f"^(#|//) {args.prefix}: (.*)") # FDATA records: # @@ -56,7 +56,7 @@ prefix_match = prefix_pat.match(line) if not prefix_match: continue - profile_line = prefix_match.group(1) + profile_line = prefix_match.group(2) fdata_match = fdata_pat.match(profile_line) preagg_match = preagg_pat.match(profile_line) nolbr_match = nolbr_pat.match(profile_line) diff --git a/bolt/test/timers.c b/bolt/test/timers.c index a34958a2a15e9..59bd0d573dba0 100644 --- a/bolt/test/timers.c +++ b/bolt/test/timers.c @@ -1,22 +1,21 @@ -/* This test checks timers for metadata manager phases. -# RUN: %clang %cflags %s -o %t.exe -# RUN: link_fdata %s %t.exe %t.fdata -# RUN: llvm-bolt %t.exe -o %t.null --data %t.fdata -w %t.yaml --time-rewrite \ -# RUN: 2>&1 | FileCheck %s -# RUN: link_fdata %s %t.exe %t.preagg PREAGG -# RUN: perf2bolt %t.exe -o %t.null -p %t.preagg --pa --time-rewrite \ -# RUN: 2>&1 | FileCheck %s --check-prefix=CHECK-P2B +// This test checks timers for metadata manager phases. +// RUN: %clang %cflags %s -o %t.exe +// RUN: link_fdata %s %t.exe %t.fdata +// RUN: llvm-bolt %t.exe -o %t.null --data %t.fdata -w %t.yaml --time-rewrite \ +// RUN: 2>&1 | FileCheck %s +// RUN: link_fdata %s %t.exe %t.preagg PREAGG +// RUN: perf2bolt %t.exe -o %t.null -p %t.preagg --pa --time-rewrite \ +// RUN: 2>&1 | FileCheck %s --check-prefix=CHECK-P2B -# CHECK-DAG: update metadata post-emit -# CHECK-DAG: process section metadata -# CHECK-DAG: process metadata pre-CFG -# CHECK-DAG: process metadata post-CFG -# CHECK-DAG: finalize metadata pre-emit +// CHECK-DAG: update metadata post-emit +// CHECK-DAG: process section metadata +// CHECK-DAG: process metadata pre-CFG +// CHECK-DAG: process metadata post-CFG +// CHECK-DAG: finalize metadata pre-emit -# CHECK-P2B-DAG: process section metadata -# CHECK-P2B-DAG: process metadata pre-CFG +// CHECK-P2B-DAG: process section metadata +// CHECK-P2B-DAG: process metadata pre-CFG -# FDATA: 0 [unknown] 0 1 main 0 1 0 -# PREAGG: B X:0 #main# 1 0 -*/ +// FDATA: 0 [unknown] 0 1 main 0 1 0 +// PREAGG: B X:0 #main# 1 0 int main() { return 0; }