[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/3] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd999..627cebf5d9453 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899..91628d950e9f4 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/3] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453..fe9f349de278d 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , >From 2b0a7b0870e722900b0538c8fb8d5e68329d0c73 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Fri, 5 Jul 2024 12:07:44 -0700 Subject: [PATCH 3/3] spr amend Created using spr 1.3.4 --- bolt/lib/Profile/YAMLProfileReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index 930bd37e14e13..54e6fa21c85d4 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -335,7 +335,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { } bool YAMLProfileReader::profileMatches( -const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { +const yaml::bolt::BinaryFunctionProfile , const BinaryFunction ) { if (opts::IgnoreHash) return Profile.NumBasicBlocks == BF.size(); return Profile.Hash == static_cast(BF.getHash()); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/3] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd999..627cebf5d9453 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899..91628d950e9f4 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/3] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453..fe9f349de278d 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , >From 2b0a7b0870e722900b0538c8fb8d5e68329d0c73 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Fri, 5 Jul 2024 12:07:44 -0700 Subject: [PATCH 3/3] spr amend Created using spr 1.3.4 --- bolt/lib/Profile/YAMLProfileReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index 930bd37e14e13..54e6fa21c85d4 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -335,7 +335,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { } bool YAMLProfileReader::profileMatches( -const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { +const yaml::bolt::BinaryFunctionProfile , const BinaryFunction ) { if (opts::IgnoreHash) return Profile.NumBasicBlocks == BF.size(); return Profile.Hash == static_cast(BF.getHash()); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/maksfb approved this pull request. https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/3] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd9992..627cebf5d9453a 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899d..91628d950e9f4a 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/3] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453a..fe9f349de278d4 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , >From 2b0a7b0870e722900b0538c8fb8d5e68329d0c73 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Fri, 5 Jul 2024 12:07:44 -0700 Subject: [PATCH 3/3] spr amend Created using spr 1.3.4 --- bolt/lib/Profile/YAMLProfileReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index 930bd37e14e138..54e6fa21c85d40 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -335,7 +335,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { } bool YAMLProfileReader::profileMatches( -const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { +const yaml::bolt::BinaryFunctionProfile , const BinaryFunction ) { if (opts::IgnoreHash) return Profile.NumBasicBlocks == BF.size(); return Profile.Hash == static_cast(BF.getHash()); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/3] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd9992..627cebf5d9453a 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899d..91628d950e9f4a 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/3] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453a..fe9f349de278d4 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , >From 2b0a7b0870e722900b0538c8fb8d5e68329d0c73 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Fri, 5 Jul 2024 12:07:44 -0700 Subject: [PATCH 3/3] spr amend Created using spr 1.3.4 --- bolt/lib/Profile/YAMLProfileReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index 930bd37e14e138..54e6fa21c85d40 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -335,7 +335,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { } bool YAMLProfileReader::profileMatches( -const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { +const yaml::bolt::BinaryFunctionProfile , const BinaryFunction ) { if (opts::IgnoreHash) return Profile.NumBasicBlocks == BF.size(); return Profile.Hash == static_cast(BF.getHash()); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/dcci approved this pull request. https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/3] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd9992..627cebf5d9453a 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899d..91628d950e9f4a 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/3] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453a..fe9f349de278d4 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , >From 2b0a7b0870e722900b0538c8fb8d5e68329d0c73 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Fri, 5 Jul 2024 12:07:44 -0700 Subject: [PATCH 3/3] spr amend Created using spr 1.3.4 --- bolt/lib/Profile/YAMLProfileReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index 930bd37e14e138..54e6fa21c85d40 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -335,7 +335,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { } bool YAMLProfileReader::profileMatches( -const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { +const yaml::bolt::BinaryFunctionProfile , const BinaryFunction ) { if (opts::IgnoreHash) return Profile.NumBasicBlocks == BF.size(); return Profile.Hash == static_cast(BF.getHash()); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung edited https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/2] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd9992..627cebf5d9453a 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899d..91628d950e9f4a 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/2] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453a..fe9f349de278d4 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/2] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd9992..627cebf5d9453a 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899d..91628d950e9f4a 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/2] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453a..fe9f349de278d4 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung edited https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -456,6 +435,39 @@ Error YAMLProfileReader::readProfile(BinaryContext ) { ++MatchedWithLTOCommonName; } } + return MatchedWithLTOCommonName; +} + +Error YAMLProfileReader::readProfile(BinaryContext ) { + if (opts::Verbosity >= 1) { +outs() << "BOLT-INFO: YAML profile with hash: "; +switch (YamlBP.Header.HashFunction) { +case HashFunction::StdHash: + outs() << "std::hash\n"; + break; +case HashFunction::XXH3: + outs() << "xxh3\n"; + break; +} + } + YamlProfileToFunction.resize(YamlBP.Functions.size() + 1); + + // Computes hash for binary functions. + if (opts::MatchProfileWithFunctionHash) { +for (auto &[_, BF] : BC.getBinaryFunctions()) { + BF.computeHash(YamlBP.Header.IsDFSOrder, YamlBP.Header.HashFunction); +} + } else if (!opts::IgnoreHash) { +for (BinaryFunction *BF : ProfileBFs) { + if (!BF) +continue; + BF->computeHash(YamlBP.Header.IsDFSOrder, YamlBP.Header.HashFunction); +} + } + + size_t MatchedWithExactName = matchWithExactName(); + size_t MatchedWithHash = matchWithHash(BC); + size_t MatchedWithLTOCommonName = matchWithLTOCommonName(); maksfb wrote: nit: make them `const`. https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -456,6 +435,39 @@ Error YAMLProfileReader::readProfile(BinaryContext ) { ++MatchedWithLTOCommonName; } } + return MatchedWithLTOCommonName; +} + +Error YAMLProfileReader::readProfile(BinaryContext ) { + if (opts::Verbosity >= 1) { +outs() << "BOLT-INFO: YAML profile with hash: "; +switch (YamlBP.Header.HashFunction) { +case HashFunction::StdHash: + outs() << "std::hash\n"; aaupov wrote: @ayermolo, we didn't switch Profile component to BC logger class. That would be a separate effort. https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -456,6 +435,39 @@ Error YAMLProfileReader::readProfile(BinaryContext ) { ++MatchedWithLTOCommonName; } } + return MatchedWithLTOCommonName; +} + +Error YAMLProfileReader::readProfile(BinaryContext ) { + if (opts::Verbosity >= 1) { +outs() << "BOLT-INFO: YAML profile with hash: "; +switch (YamlBP.Header.HashFunction) { +case HashFunction::StdHash: + outs() << "std::hash\n"; shawbyoung wrote: I'm erring on the side of making minimal code change - although it's showing up on gh as code added, I haven't touched the prologue of readProfile. If you see the large "deleted" section above (starting on the original line 353 of YAMLProfileReader.cpp) it's the exact same. So, I'd like to keep this PR just about refactoring function matching. https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung edited https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -456,6 +435,39 @@ Error YAMLProfileReader::readProfile(BinaryContext ) { ++MatchedWithLTOCommonName; } } + return MatchedWithLTOCommonName; +} + +Error YAMLProfileReader::readProfile(BinaryContext ) { + if (opts::Verbosity >= 1) { +outs() << "BOLT-INFO: YAML profile with hash: "; +switch (YamlBP.Header.HashFunction) { +case HashFunction::StdHash: + outs() << "std::hash\n"; + break; +case HashFunction::XXH3: + outs() << "xxh3\n"; + break; +} + } + YamlProfileToFunction.resize(YamlBP.Functions.size() + 1); + + // Computes hash for binary functions. + if (opts::MatchProfileWithFunctionHash) { +for (auto &[_, BF] : BC.getBinaryFunctions()) { + BF.computeHash(YamlBP.Header.IsDFSOrder, YamlBP.Header.HashFunction); +} + } else if (!opts::IgnoreHash) { +for (BinaryFunction *BF : ProfileBFs) { + if (!BF) +continue; + BF->computeHash(YamlBP.Header.IsDFSOrder, YamlBP.Header.HashFunction); +} + } + + size_t MatchedWithExactName = matchWithExactName(); shawbyoung wrote: In lines 481 - 487 > if (opts::Verbosity >= 1) { >outs() << "BOLT-INFO: matched " << MatchedWithExactName > << " functions with identical names\n"; > ... Match counts are directed to outs() https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -456,6 +435,39 @@ Error YAMLProfileReader::readProfile(BinaryContext ) { ++MatchedWithLTOCommonName; } } + return MatchedWithLTOCommonName; +} + +Error YAMLProfileReader::readProfile(BinaryContext ) { + if (opts::Verbosity >= 1) { +outs() << "BOLT-INFO: YAML profile with hash: "; +switch (YamlBP.Header.HashFunction) { +case HashFunction::StdHash: + outs() << "std::hash\n"; ayermolo wrote: BC.outs() https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -456,6 +435,39 @@ Error YAMLProfileReader::readProfile(BinaryContext ) { ++MatchedWithLTOCommonName; } } + return MatchedWithLTOCommonName; +} + +Error YAMLProfileReader::readProfile(BinaryContext ) { + if (opts::Verbosity >= 1) { +outs() << "BOLT-INFO: YAML profile with hash: "; +switch (YamlBP.Header.HashFunction) { +case HashFunction::StdHash: + outs() << "std::hash\n"; + break; +case HashFunction::XXH3: + outs() << "xxh3\n"; + break; +} + } + YamlProfileToFunction.resize(YamlBP.Functions.size() + 1); + + // Computes hash for binary functions. + if (opts::MatchProfileWithFunctionHash) { +for (auto &[_, BF] : BC.getBinaryFunctions()) { + BF.computeHash(YamlBP.Header.IsDFSOrder, YamlBP.Header.HashFunction); +} + } else if (!opts::IgnoreHash) { +for (BinaryFunction *BF : ProfileBFs) { + if (!BF) +continue; + BF->computeHash(YamlBP.Header.IsDFSOrder, YamlBP.Header.HashFunction); +} + } + + size_t MatchedWithExactName = matchWithExactName(); ayermolo wrote: This doesn't look like it's used anywhere? https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH 1/2] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd999..627cebf5d9453 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899..91628d950e9f4 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) >From 1f48f09228b54e410910c2186cf0c3a73400bfd3 Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 10:26:27 -0700 Subject: [PATCH 2/2] Changing profileMatches BF param to const Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index 627cebf5d9453..fe9f349de278d 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -75,7 +75,7 @@ class YAMLProfileReader : public ProfileReaderBase { /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , - BinaryFunction ); + const BinaryFunction ); /// Infer function profile from stale data (collected on older binaries). bool inferStaleProfile(BinaryFunction , ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/aaupov approved this pull request. LG % nit https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/aaupov edited https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
@@ -334,6 +334,13 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } +bool YAMLProfileReader::profileMatches( +const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { aaupov wrote: ```suggestion const yaml::bolt::BinaryFunctionProfile , const BinaryFunction ) { ``` https://github.com/llvm/llvm-project/pull/97502 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] [BOLT][NFC] Refactor function matching (PR #97502)
https://github.com/shawbyoung updated https://github.com/llvm/llvm-project/pull/97502 >From c6212e4b26b0f0d8abde323fa5fc04ecc6dd34fd Mon Sep 17 00:00:00 2001 From: shawbyoung Date: Wed, 3 Jul 2024 09:45:46 -0700 Subject: [PATCH] Changed profileMatches comment Created using spr 1.3.4 --- bolt/include/bolt/Profile/YAMLProfileReader.h | 2 +- bolt/lib/Profile/YAMLProfileReader.cpp| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h index a5bd3544bd999..627cebf5d9453 100644 --- a/bolt/include/bolt/Profile/YAMLProfileReader.h +++ b/bolt/include/bolt/Profile/YAMLProfileReader.h @@ -73,7 +73,7 @@ class YAMLProfileReader : public ProfileReaderBase { bool parseFunctionProfile(BinaryFunction , const yaml::bolt::BinaryFunctionProfile ); - /// Returns block cnt equality if IgnoreHash is true, otherwise, hash equality + /// Checks if a function profile matches a binary function. bool profileMatches(const yaml::bolt::BinaryFunctionProfile , BinaryFunction ); diff --git a/bolt/lib/Profile/YAMLProfileReader.cpp b/bolt/lib/Profile/YAMLProfileReader.cpp index e8ce187367899..91628d950e9f4 100644 --- a/bolt/lib/Profile/YAMLProfileReader.cpp +++ b/bolt/lib/Profile/YAMLProfileReader.cpp @@ -333,6 +333,7 @@ Error YAMLProfileReader::preprocessProfile(BinaryContext ) { return Error::success(); } + bool YAMLProfileReader::profileMatches( const yaml::bolt::BinaryFunctionProfile , BinaryFunction ) { if (opts::IgnoreHash) ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits