@@ -1250,23 +1250,23 @@ TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_test) {
1250
1250
FuncNames.push_back (" bar3" );
1251
1251
InstrProfSymtab Symtab;
1252
1252
EXPECT_THAT_ERROR (Symtab.create (FuncNames), Succeeded ());
1253
- StringRef R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" func1" ));
1253
+ StringRef R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" func1" ));
1254
1254
ASSERT_EQ (StringRef (" func1" ), R);
1255
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" func2" ));
1255
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" func2" ));
1256
1256
ASSERT_EQ (StringRef (" func2" ), R);
1257
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" func3" ));
1257
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" func3" ));
1258
1258
ASSERT_EQ (StringRef (" func3" ), R);
1259
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar1" ));
1259
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar1" ));
1260
1260
ASSERT_EQ (StringRef (" bar1" ), R);
1261
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar2" ));
1261
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar2" ));
1262
1262
ASSERT_EQ (StringRef (" bar2" ), R);
1263
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar3" ));
1263
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar3" ));
1264
1264
ASSERT_EQ (StringRef (" bar3" ), R);
1265
1265
1266
1266
// negative tests
1267
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar4" ));
1267
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar4" ));
1268
1268
ASSERT_EQ (StringRef (), R);
1269
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" foo4" ));
1269
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" foo4" ));
1270
1270
ASSERT_EQ (StringRef (), R);
1271
1271
1272
1272
// Now incrementally update the symtab
@@ -1275,23 +1275,23 @@ TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_test) {
1275
1275
EXPECT_THAT_ERROR (Symtab.addFuncName (" blah_3" ), Succeeded ());
1276
1276
1277
1277
// Check again
1278
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" blah_1" ));
1278
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" blah_1" ));
1279
1279
ASSERT_EQ (StringRef (" blah_1" ), R);
1280
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" blah_2" ));
1280
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" blah_2" ));
1281
1281
ASSERT_EQ (StringRef (" blah_2" ), R);
1282
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" blah_3" ));
1282
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" blah_3" ));
1283
1283
ASSERT_EQ (StringRef (" blah_3" ), R);
1284
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" func1" ));
1284
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" func1" ));
1285
1285
ASSERT_EQ (StringRef (" func1" ), R);
1286
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" func2" ));
1286
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" func2" ));
1287
1287
ASSERT_EQ (StringRef (" func2" ), R);
1288
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" func3" ));
1288
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" func3" ));
1289
1289
ASSERT_EQ (StringRef (" func3" ), R);
1290
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar1" ));
1290
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar1" ));
1291
1291
ASSERT_EQ (StringRef (" bar1" ), R);
1292
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar2" ));
1292
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar2" ));
1293
1293
ASSERT_EQ (StringRef (" bar2" ), R);
1294
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (" bar3" ));
1294
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (" bar3" ));
1295
1295
ASSERT_EQ (StringRef (" bar3" ), R);
1296
1296
}
1297
1297
@@ -1331,14 +1331,14 @@ TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_module_test) {
1331
1331
1332
1332
std::string IRPGOName = getIRPGOFuncName (*F);
1333
1333
auto IRPGOFuncName =
1334
- ProfSymtab.getFuncName (IndexedInstrProf::ComputeHash (IRPGOName));
1334
+ ProfSymtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (IRPGOName));
1335
1335
EXPECT_EQ (StringRef (IRPGOName), IRPGOFuncName);
1336
1336
EXPECT_EQ (StringRef (Funcs[I]),
1337
1337
getParsedIRPGOFuncName (IRPGOFuncName).second );
1338
1338
// Ensure we can still read this old record name.
1339
1339
std::string PGOName = getPGOFuncName (*F);
1340
1340
auto PGOFuncName =
1341
- ProfSymtab.getFuncName (IndexedInstrProf::ComputeHash (PGOName));
1341
+ ProfSymtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (PGOName));
1342
1342
EXPECT_EQ (StringRef (PGOName), PGOFuncName);
1343
1343
EXPECT_THAT (PGOFuncName.str (), EndsWith (Funcs[I].str ()));
1344
1344
}
@@ -1396,9 +1396,10 @@ TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_compression_test) {
1396
1396
1397
1397
// Now do the checks:
1398
1398
// First sampling some data points:
1399
- StringRef R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (FuncNames1[0 ]));
1399
+ StringRef R =
1400
+ Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (FuncNames1[0 ]));
1400
1401
ASSERT_EQ (StringRef (" func_0" ), R);
1401
- R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (FuncNames1[1 ]));
1402
+ R = Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (FuncNames1[1 ]));
1402
1403
ASSERT_EQ (StringRef (" f oooooooooooooo_0" ), R);
1403
1404
for (int I = 0 ; I < 3 ; I++) {
1404
1405
std::string N[4 ];
@@ -1407,7 +1408,8 @@ TEST_P(MaybeSparseInstrProfTest, instr_prof_symtab_compression_test) {
1407
1408
N[2 ] = FuncNames2[2 * I];
1408
1409
N[3 ] = FuncNames2[2 * I + 1 ];
1409
1410
for (int J = 0 ; J < 4 ; J++) {
1410
- StringRef R = Symtab.getFuncName (IndexedInstrProf::ComputeHash (N[J]));
1411
+ StringRef R =
1412
+ Symtab.getFuncOrVarName (IndexedInstrProf::ComputeHash (N[J]));
1411
1413
ASSERT_EQ (StringRef (N[J]), R);
1412
1414
}
1413
1415
}
0 commit comments