maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-exegesis] Fix a warning in r332221 

comparison of integers of different signs: 'const unsigned long' and 'const int' [-Werror,-Wsign-compare]

unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp:60:5: note: in instantiation of function template specialization 'testing::internal::EqHelper<false>::Compare<unsigned long, int>' requested here
    ASSERT_EQ(FromDiskVector.size(), 1);

llvm-svn: 332230
This commit is contained in:
Clement Courbet 2018-05-14 11:31:02 +00:00
parent 3d479fe81c
commit 4623da8991
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/tools/llvm-exegesis/lib/Analysis.cpp
View File

@ -17,20 +17,13 @@ void renderInstructionRow(const InstructionBenchmark &Point,
OS << "\n";
}
void analyzeCluster(const std::vector<InstructionBenchmark> &Points,
const llvm::MCSubtargetInfo &STI,
const InstructionBenchmarkClustering::Cluster &Cluster,
llvm::raw_ostream &OS) {
void printCluster(const std::vector<InstructionBenchmark> &Points,
const llvm::MCSubtargetInfo &STI,
const size_t ClusterId,
const InstructionBenchmarkClustering::Cluster &Cluster,
llvm::raw_ostream &OS) {
// TODO:
// std::sort(Cluster.PointIndices.begin(), Cluster.PointIndices.end(),
// [](int PointIdA, int PointIdB) { return GetSchedClass(Points[PointIdA]) <
// GetSchedClass(Points[PointIdB]); });
OS << "Cluster:\n";
// Get max length of the name for alignement.
size_t NameLen = 0;
for (const auto &PointId : Cluster.PointIndices) {
NameLen = std::max(NameLen, Points[PointId].AsmTmpl.Name.size());
}
// Print all points.
for (const auto &PointId : Cluster.PointIndices) {
@ -43,10 +36,10 @@ void analyzeCluster(const std::vector<InstructionBenchmark> &Points,
llvm::Error
printAnalysisClusters(const InstructionBenchmarkClustering &Clustering,
const llvm::MCSubtargetInfo &STI, llvm::raw_ostream &OS) {
for (const auto &Cluster : Clustering.getValidClusters()) {
analyzeCluster(Clustering.getPoints(), STI, Cluster, OS);
OS << "\n\n\n";
OS << "cluster_id,key,";
for (size_t I = 0, E = Clustering.getValidClusters().size(); I < E; ++I) {
printCluster(Clustering.getPoints(), STI, I, Clustering.getValidClusters()[I], OS);
OS << "\n\n";
}
return llvm::Error::success();

2
llvm/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp
View File

@ -57,7 +57,7 @@ TEST(BenchmarkResultTest, WriteToAndReadFromDisk) {
{
// Vector version.
const auto FromDiskVector = InstructionBenchmark::readYamlsOrDie(Filename);
ASSERT_EQ(FromDiskVector.size(), 1);
ASSERT_EQ(FromDiskVector.size(), size_t{1});
const auto FromDisk = FromDiskVector[0];
EXPECT_EQ(FromDisk.AsmTmpl.Name, ToDisk.AsmTmpl.Name);
EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName);