Re: [PATCH] D19184: Remove MaxFunctionCount module flag annotation
This revision was automatically updated to reflect the committed changes. Closed by commit rL273198: Remove MaxFunctionCount module flag annotation. (authored by eraman). Changed prior to commit: http://reviews.llvm.org/D19184?vs=53969=61302#toc Repository: rL LLVM http://reviews.llvm.org/D19184 Files: cfe/trunk/lib/CodeGen/CodeGenModule.cpp cfe/trunk/test/Profile/max-function-count.c Index: cfe/trunk/test/Profile/max-function-count.c === --- cfe/trunk/test/Profile/max-function-count.c +++ cfe/trunk/test/Profile/max-function-count.c @@ -1,24 +0,0 @@ -// Test that maximum function counts are set correctly. - -// RUN: llvm-profdata merge %S/Inputs/max-function-count.proftext -o %t.profdata -// RUN: %clang_cc1 %s -o - -disable-llvm-optzns -emit-llvm -fprofile-instrument-use-path=%t.profdata | FileCheck %s -// -int begin(int i) { - if (i) -return 0; - return 1; -} - -int end(int i) { - if (i) -return 0; - return 1; -} - -int main(int argc, const char *argv[]) { - begin(0); - end(1); - end(1); - return 0; -} -// CHECK: !{{[0-9]+}} = !{i32 1, !"MaxFunctionCount", i32 2} Index: cfe/trunk/lib/CodeGen/CodeGenModule.cpp === --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp @@ -393,7 +393,6 @@ OpenMPRuntime->emitRegistrationFunction()) AddGlobalCtor(OpenMPRegistrationFunction, 0); if (PGOReader) { -getModule().setMaximumFunctionCount(PGOReader->getMaximumFunctionCount()); getModule().setProfileSummary(PGOReader->getSummary().getMD(VMContext)); if (PGOStats.hasDiagnostics()) PGOStats.reportDiagnostics(getDiags(), getCodeGenOpts().MainFileName); Index: cfe/trunk/test/Profile/max-function-count.c === --- cfe/trunk/test/Profile/max-function-count.c +++ cfe/trunk/test/Profile/max-function-count.c @@ -1,24 +0,0 @@ -// Test that maximum function counts are set correctly. - -// RUN: llvm-profdata merge %S/Inputs/max-function-count.proftext -o %t.profdata -// RUN: %clang_cc1 %s -o - -disable-llvm-optzns -emit-llvm -fprofile-instrument-use-path=%t.profdata | FileCheck %s -// -int begin(int i) { - if (i) -return 0; - return 1; -} - -int end(int i) { - if (i) -return 0; - return 1; -} - -int main(int argc, const char *argv[]) { - begin(0); - end(1); - end(1); - return 0; -} -// CHECK: !{{[0-9]+}} = !{i32 1, !"MaxFunctionCount", i32 2} Index: cfe/trunk/lib/CodeGen/CodeGenModule.cpp === --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp @@ -393,7 +393,6 @@ OpenMPRuntime->emitRegistrationFunction()) AddGlobalCtor(OpenMPRegistrationFunction, 0); if (PGOReader) { -getModule().setMaximumFunctionCount(PGOReader->getMaximumFunctionCount()); getModule().setProfileSummary(PGOReader->getSummary().getMD(VMContext)); if (PGOStats.hasDiagnostics()) PGOStats.reportDiagnostics(getDiags(), getCodeGenOpts().MainFileName); ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
Re: [PATCH] D19184: Remove MaxFunctionCount module flag annotation
eraman added a comment. This patch and the one in http://reviews.llvm.org/D19185 are now ready to land as the inliner now uses ProfileSummaryInfo. I will check them in. http://reviews.llvm.org/D19184 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
Re: [PATCH] D19184: Remove MaxFunctionCount module flag annotation
vsk added a comment. Lgtm http://reviews.llvm.org/D19184 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D19184: Remove MaxFunctionCount module flag annotation
eraman created this revision. eraman added a reviewer: vsk. eraman added subscribers: cfe-commits, davidxl. Step 2 of MaxFunctionCount removal. It is superseded by ProfileSummary flag. http://reviews.llvm.org/D19184 Files: lib/CodeGen/CodeGenModule.cpp test/Profile/max-function-count.c Index: test/Profile/max-function-count.c === --- test/Profile/max-function-count.c +++ /dev/null @@ -1,24 +0,0 @@ -// Test that maximum function counts are set correctly. - -// RUN: llvm-profdata merge %S/Inputs/max-function-count.proftext -o %t.profdata -// RUN: %clang %s -o - -mllvm -disable-llvm-optzns -emit-llvm -S -fprofile-instr-use=%t.profdata | FileCheck %s -// -int begin(int i) { - if (i) -return 0; - return 1; -} - -int end(int i) { - if (i) -return 0; - return 1; -} - -int main(int argc, const char *argv[]) { - begin(0); - end(1); - end(1); - return 0; -} -// CHECK: !{{[0-9]+}} = !{i32 1, !"MaxFunctionCount", i32 2} Index: lib/CodeGen/CodeGenModule.cpp === --- lib/CodeGen/CodeGenModule.cpp +++ lib/CodeGen/CodeGenModule.cpp @@ -393,7 +393,6 @@ OpenMPRuntime->emitRegistrationFunction()) AddGlobalCtor(OpenMPRegistrationFunction, 0); if (PGOReader) { -getModule().setMaximumFunctionCount(PGOReader->getMaximumFunctionCount()); getModule().setProfileSummary(PGOReader->getSummary().getMD(VMContext)); if (PGOStats.hasDiagnostics()) PGOStats.reportDiagnostics(getDiags(), getCodeGenOpts().MainFileName); Index: test/Profile/max-function-count.c === --- test/Profile/max-function-count.c +++ /dev/null @@ -1,24 +0,0 @@ -// Test that maximum function counts are set correctly. - -// RUN: llvm-profdata merge %S/Inputs/max-function-count.proftext -o %t.profdata -// RUN: %clang %s -o - -mllvm -disable-llvm-optzns -emit-llvm -S -fprofile-instr-use=%t.profdata | FileCheck %s -// -int begin(int i) { - if (i) -return 0; - return 1; -} - -int end(int i) { - if (i) -return 0; - return 1; -} - -int main(int argc, const char *argv[]) { - begin(0); - end(1); - end(1); - return 0; -} -// CHECK: !{{[0-9]+}} = !{i32 1, !"MaxFunctionCount", i32 2} Index: lib/CodeGen/CodeGenModule.cpp === --- lib/CodeGen/CodeGenModule.cpp +++ lib/CodeGen/CodeGenModule.cpp @@ -393,7 +393,6 @@ OpenMPRuntime->emitRegistrationFunction()) AddGlobalCtor(OpenMPRegistrationFunction, 0); if (PGOReader) { -getModule().setMaximumFunctionCount(PGOReader->getMaximumFunctionCount()); getModule().setProfileSummary(PGOReader->getSummary().getMD(VMContext)); if (PGOStats.hasDiagnostics()) PGOStats.reportDiagnostics(getDiags(), getCodeGenOpts().MainFileName); ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits