add test data and flag-gated fix for pull request 76312

mingmingl-llvm · mingmingl-llvm · commit b3999246b1a9 · 2023-12-25T17:26:59.000-08:00
diff --git a/llvm/lib/ProfileData/InstrProfReader.cpp b/llvm/lib/ProfileData/InstrProfReader.cpp
@@ -38,6 +38,8 @@
 
 using namespace llvm;
 
+static cl::opt<bool> SwapFuncPointer("swap-func-ptr", cl::init(false));
+
 // Extracts the variant information from the top 32 bits in the version and
 // returns an enum specifying the variants present.
 static InstrProfKind getProfileKindFromVersion(uint64_t Version) {
@@ -539,7 +541,7 @@ Error RawInstrProfReader<IntPtrT>::createSymtab(InstrProfSymtab &Symtab) {
     const IntPtrT FPtr = swap(I->FunctionPointer);
     if (!FPtr)
       continue;
-    Symtab.mapAddress(FPtr, I->NameRef);
+    Symtab.mapAddress(FPtr, SwapFuncPointer ? swap(I->NameRef) : I->NameRef);
   }
   return success();
 }
diff --git a/testdata/README.md b/testdata/README.md
@@ -0,0 +1,50 @@
+
+```
+./bin/llvm-profdata show --function=_Z11global_funcv -ic-targets ../testdata/thinlto_indirect_call_promotion_bigendian.profraw 
+Counters:
+  _Z11global_funcv:
+    Hash: 0x07deb612ffffffff
+    Counters: 1
+    Indirect Call Site Count: 2
+    Indirect Target Results:
+	[  0, ,          1 ] (100.00%)
+	[  1, ,          1 ] (100.00%)
+Instrumentation level: IR  entry_first = 0
+Functions shown: 1
+Total functions: 4
+Maximum function count: 1
+Maximum internal block count: 0
+Statistics for indirect call sites profile:
+  Total number of sites: 2
+  Total number of sites with values: 2
+  Total number of profiled values: 2
+  Value sites histogram:
+	NumTargets, SiteCount
+	1, 2
+```
+	
+
+```
+./bin/llvm-profdata show --function=_Z11global_funcv -ic-targets -swap-func-ptr ../testdata/thinlto_indirect_call_promotion_bigendian.profraw 
+Counters:
+  _Z11global_funcv:
+    Hash: 0x07deb612ffffffff
+    Counters: 1
+    Indirect Call Site Count: 2
+    Indirect Target Results:
+	[  0, lib.cc;_ZL7callee0v,          1 ] (100.00%)
+	[  1, _Z7callee1v,          1 ] (100.00%)
+Instrumentation level: IR  entry_first = 0
+Functions shown: 1
+Total functions: 4
+Maximum function count: 1
+Maximum internal block count: 0
+Statistics for indirect call sites profile:
+  Total number of sites: 2
+  Total number of sites with values: 2
+  Total number of profiled values: 2
+  Value sites histogram:
+	NumTargets, SiteCount
+	1, 2
+```
+
diff --git a/testdata/src/bigprof.text b/testdata/src/bigprof.text
@@ -0,0 +1 @@
+ff6c70726f667281010000000000000900000000000000000000000000000004000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000043ffffffffffffffe0ffffaa23e2bbe748000055dc1d436eb30000000000000001c893b0fd20b3ea110a4d0ad3efffffffffffffffffffffe00000000000000000000055dc1d4399100000000000000000000000010000000000000000000000007c2cd54c6c33995b0a4d0ad3efffffffffffffffffffffa80000000000000000000055dc1d439920000000000000000000000001000000000000000000000000df6ec2613a2825d507deb612ffffffffffffffffffffff700000000000000000000055dc1d439930000055dc1d4419b800000001000200000000000000000000db956436e78dd5fa0a4d0ad3efffffffffffffffffffff380000000000000000000055dc1d4399800000000000000000000000010000000000000000000000000000000000000001000000000000000100000000000000010000000000000001303378da8b8f324f4eccc9494d352c63ccc94cd24b4eb68e8ff2818a199431c647191aa6e7e42725e6c4a795e6259701008f7c10bb040c78dacb4dcccc0300041b01a60000000000000000380000000100000000000000020101000000000000000055dc1d4399200000000000000001000055dc1d4399100000000000000001
diff --git a/testdata/src/print.cc b/testdata/src/print.cc
@@ -0,0 +1,38 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+
+int main() {
+    FILE* r = fopen("bigprof.profraw", "r");
+
+    FILE* w = fopen("bigendian.profout", "wb");
+
+    char buffer[5000];
+
+    size_t numread = fread(buffer, sizeof(unsigned char), 5000, r);
+    printf("numread is %zu\n", numread);
+
+    int i = 0;
+    for (i = 0; i < numread; i += 2) {
+        char hex[5]="0x";
+        hex[2] = buffer[i];
+        if (i + 1 < numread) {
+        hex[3] = buffer[i + 1];
+        hex[4] = '\0';
+        } else {
+            hex[3] = '\0';
+        }
+        printf("hex string is %s\n", hex);
+        int n = strtol(hex, NULL, 16);
+        uint8_t val = n;
+        printf("Number %o\n", val);
+        fwrite(&val, 1, 1, w);
+    }
+    printf("numread is %zu\n", numread);
+
+    fclose(r);
+    fclose(w);
+
+    return 0;
+}
+
diff --git a/testdata/thinlto_indirect_call_promotion.bigendian.hexdump b/testdata/thinlto_indirect_call_promotion.bigendian.hexdump
@@ -0,0 +1,34 @@
+00000000  ff 6c 70 72 6f 66 72 81  01 00 00 00 00 00 00 09  |.lprofr.........|
+00000010  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 04  |................|
+*
+00000030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00000040  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 43  |...............C|
+00000050  ff ff ff ff ff ff ff e0  ff ff aa 23 e2 bb e7 48  |...........#...H|
+00000060  00 00 55 dc 1d 43 6e b3  00 00 00 00 00 00 00 01  |..U..Cn.........|
+00000070  c8 93 b0 fd 20 b3 ea 11  0a 4d 0a d3 ef ff ff ff  |.... ....M......|
+00000080  ff ff ff ff ff ff ff e0  00 00 00 00 00 00 00 00  |................|
+00000090  00 00 55 dc 1d 43 99 10  00 00 00 00 00 00 00 00  |..U..C..........|
+000000a0  00 00 00 01 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+000000b0  7c 2c d5 4c 6c 33 99 5b  0a 4d 0a d3 ef ff ff ff  ||,.Ll3.[.M......|
+000000c0  ff ff ff ff ff ff ff a8  00 00 00 00 00 00 00 00  |................|
+000000d0  00 00 55 dc 1d 43 99 20  00 00 00 00 00 00 00 00  |..U..C. ........|
+000000e0  00 00 00 01 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+000000f0  df 6e c2 61 3a 28 25 d5  07 de b6 12 ff ff ff ff  |.n.a:(%.........|
+00000100  ff ff ff ff ff ff ff 70  00 00 00 00 00 00 00 00  |.......p........|
+00000110  00 00 55 dc 1d 43 99 30  00 00 55 dc 1d 44 19 b8  |..U..C.0..U..D..|
+00000120  00 00 00 01 00 02 00 00  00 00 00 00 00 00 00 00  |................|
+00000130  db 95 64 36 e7 8d d5 fa  0a 4d 0a d3 ef ff ff ff  |..d6.....M......|
+00000140  ff ff ff ff ff ff ff 38  00 00 00 00 00 00 00 00  |.......8........|
+00000150  00 00 55 dc 1d 43 99 80  00 00 00 00 00 00 00 00  |..U..C..........|
+00000160  00 00 00 01 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00000170  00 00 00 00 00 00 00 01  00 00 00 00 00 00 00 01  |................|
+*
+00000190  30 33 78 da 8b 8f 32 4f  4e cc c9 49 4d 35 2c 63  |03x...2ON..IM5,c|
+000001a0  cc c9 4c d2 4b 4e b6 8e  8f f2 81 8a 19 94 31 c6  |..L.KN........1.|
+000001b0  47 19 1a a6 e7 e4 27 25  e6 c4 a7 95 e6 25 97 01  |G.....'%.....%..|
+000001c0  00 8f 7c 10 bb 04 0c 78  da cb 4d cc cc 03 00 04  |..|....x..M.....|
+000001d0  1b 01 a6 00 00 00 00 00  00 00 00 38 00 00 00 01  |...........8....|
+000001e0  00 00 00 00 00 00 00 02  01 01 00 00 00 00 00 00  |................|
+000001f0  00 00 55 dc 1d 43 99 20  00 00 00 00 00 00 00 01  |..U..C. ........|
+00000200  00 00 55 dc 1d 43 99 10  00 00 00 00 00 00 00 01  |..U..C..........|
+00000210
diff --git a/testdata/thinlto_indirect_call_promotion.littleendian.hexdump b/testdata/thinlto_indirect_call_promotion.littleendian.hexdump
@@ -0,0 +1,34 @@
+00000000  81 72 66 6f 72 70 6c ff  09 00 00 00 00 00 00 01  |.rforpl.........|
+00000010  00 00 00 00 00 00 00 00  04 00 00 00 00 00 00 00  |................|
+*
+00000030  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00000040  00 00 00 00 00 00 00 00  43 00 00 00 00 00 00 00  |........C.......|
+00000050  e0 ff ff ff ff ff ff ff  48 e7 bb e2 23 aa ff ff  |........H...#...|
+00000060  b3 6e 43 1d dc 55 00 00  01 00 00 00 00 00 00 00  |.nC..U..........|
+00000070  11 ea b3 20 fd b0 93 c8  ff ff ff ef d3 0a 4d 0a  |... ..........M.|
+00000080  e0 ff ff ff ff ff ff ff  00 00 00 00 00 00 00 00  |................|
+00000090  10 99 43 1d dc 55 00 00  00 00 00 00 00 00 00 00  |..C..U..........|
+000000a0  01 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+000000b0  5b 99 33 6c 4c d5 2c 7c  ff ff ff ef d3 0a 4d 0a  |[.3lL.,|......M.|
+000000c0  a8 ff ff ff ff ff ff ff  00 00 00 00 00 00 00 00  |................|
+000000d0  20 99 43 1d dc 55 00 00  00 00 00 00 00 00 00 00  | .C..U..........|
+000000e0  01 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+000000f0  d5 25 28 3a 61 c2 6e df  ff ff ff ff 12 b6 de 07  |.%(:a.n.........|
+00000100  70 ff ff ff ff ff ff ff  00 00 00 00 00 00 00 00  |p...............|
+00000110  30 99 43 1d dc 55 00 00  b8 19 44 1d dc 55 00 00  |0.C..U....D..U..|
+00000120  01 00 00 00 02 00 00 00  00 00 00 00 00 00 00 00  |................|
+00000130  fa d5 8d e7 36 64 95 db  ff ff ff ef d3 0a 4d 0a  |....6d........M.|
+00000140  38 ff ff ff ff ff ff ff  00 00 00 00 00 00 00 00  |8...............|
+00000150  80 99 43 1d dc 55 00 00  00 00 00 00 00 00 00 00  |..C..U..........|
+00000160  01 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+00000170  01 00 00 00 00 00 00 00  01 00 00 00 00 00 00 00  |................|
+*
+00000190  30 33 78 da 8b 8f 32 4f  4e cc c9 49 4d 35 2c 63  |03x...2ON..IM5,c|
+000001a0  cc c9 4c d2 4b 4e b6 8e  8f f2 81 8a 19 94 31 c6  |..L.KN........1.|
+000001b0  47 19 1a a6 e7 e4 27 25  e6 c4 a7 95 e6 25 97 01  |G.....'%.....%..|
+000001c0  00 8f 7c 10 bb 04 0c 78  da cb 4d cc cc 03 00 04  |..|....x..M.....|
+000001d0  1b 01 a6 00 00 00 00 00  38 00 00 00 01 00 00 00  |........8.......|
+000001e0  00 00 00 00 02 00 00 00  01 01 00 00 00 00 00 00  |................|
+000001f0  20 99 43 1d dc 55 00 00  01 00 00 00 00 00 00 00  | .C..U..........|
+00000200  10 99 43 1d dc 55 00 00  01 00 00 00 00 00 00 00  |..C..U..........|
+00000210
diff --git a/testdata/thinlto_indirect_call_promotion.profraw b/testdata/thinlto_indirect_call_promotion.profraw
diff --git a/testdata/thinlto_indirect_call_promotion_bigendian.profraw b/testdata/thinlto_indirect_call_promotion_bigendian.profraw

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ff6c70726f667281010000000000000900000000000000000000000000000004000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000043ffffffffffffffe0ffffaa23e2bbe748000055dc1d436eb30000000000000001c893b0fd20b3ea110a4d0ad3efffffffffffffffffffffe00000000000000000000055dc1d4399100000000000000000000000010000000000000000000000007c2cd54c6c33995b0a4d0ad3efffffffffffffffffffffa80000000000000000000055dc1d439920000000000000000000000001000000000000000000000000df6ec2613a2825d507deb612ffffffffffffffffffffff700000000000000000000055dc1d439930000055dc1d4419b800000001000200000000000000000000db956436e78dd5fa0a4d0ad3efffffffffffffffffffff380000000000000000000055dc1d4399800000000000000000000000010000000000000000000000000000000000000001000000000000000100000000000000010000000000000001303378da8b8f324f4eccc9494d352c63ccc94cd24b4eb68e8ff2818a199431c647191aa6e7e42725e6c4a795e6259701008f7c10bb040c78dacb4dcccc0300041b01a60000000000000000380000000100000000000000020101000000000000000055dc1d4399200000000000000001000055dc1d4399100000000000000001