PAPI: Kunpeng920 patches

Golden_Repo/2021a/l/libpfm/libpfm-4.11.1-f6500e77-Clang-11.1.0.eb

@@ -14,9 +14,6 @@ provided by the Performance Monitoring Unit (PMU) of modern processors.
 toolchain = {'name': 'Clang', 'version': '11.1.0'}
 toolchainopts = {'pic': True}
 
-source_urls = ['http://ftp.gnu.org/gnu/readline']
-sources = ['readline-%(version)s.tar.gz']
-
 sources = [{
     'filename': '%(name)s-%(version)s.tar.gz',
     'git_config': {
@@ -27,7 +24,14 @@ sources = [{
     },
 }]
 
-patches = ['libpfm4-add-cortex-a72.patch']
+patches = [
+           # Patches for Kunpeng920 from https://sourceforge.net/p/perfmon2/libpfm4/merge-requests/17/
+           # As of 2021-07-10 the merge request is still pending
+           '0001-Adds-support-for-HiSilicon-Kunpeng-920-core-and-unco.patch',
+           '0002-Updates-num_cntrs-and-some-cleanup.patch',
+           # Patch for Cortex-A72 (for Hi1616)
+           'libpfm4-add-cortex-a72.patch',
+]
 
 dependencies = [
     ('binutils', '2.36.1')

Golden_Repo/2021a/l/libpfm/libpfm-4.11.1-f6500e77-Clang-12.0.0.eb

@@ -14,9 +14,6 @@ provided by the Performance Monitoring Unit (PMU) of modern processors.
 toolchain = {'name': 'Clang', 'version': '12.0.0'}
 toolchainopts = {'pic': True}
 
-source_urls = ['http://ftp.gnu.org/gnu/readline']
-sources = ['readline-%(version)s.tar.gz']
-
 sources = [{
     'filename': '%(name)s-%(version)s.tar.gz',
     'git_config': {
@@ -27,7 +24,14 @@ sources = [{
     },
 }]
 
-patches = ['libpfm4-add-cortex-a72.patch']
+patches = [
+           # Patches for Kunpeng920 from https://sourceforge.net/p/perfmon2/libpfm4/merge-requests/17/
+           # As of 2021-07-10 the merge request is still pending
+           '0001-Adds-support-for-HiSilicon-Kunpeng-920-core-and-unco.patch',
+           '0002-Updates-num_cntrs-and-some-cleanup.patch',
+           # Patch for Cortex-A72 (for Hi1616)
+           'libpfm4-add-cortex-a72.patch',
+]
 
 dependencies = [
     ('binutils', '2.36.1')

Golden_Repo/2021a/l/libpfm/libpfm-4.11.1-f6500e77-GCCcore-10.3.0.eb

@@ -14,9 +14,6 @@ provided by the Performance Monitoring Unit (PMU) of modern processors.
 toolchain = {'name': 'GCCcore', 'version': '10.3.0'}
 toolchainopts = {'pic': True}
 
-source_urls = ['http://ftp.gnu.org/gnu/readline']
-sources = ['readline-%(version)s.tar.gz']
-
 sources = [{
     'filename': '%(name)s-%(version)s.tar.gz',
     'git_config': {
@@ -27,7 +24,14 @@ sources = [{
     },
 }]
 
-patches = ['libpfm4-add-cortex-a72.patch']
+patches = [
+           # Patches for Kunpeng920 from https://sourceforge.net/p/perfmon2/libpfm4/merge-requests/17/
+           # As of 2021-07-10 the merge request is still pending
+           '0001-Adds-support-for-HiSilicon-Kunpeng-920-core-and-unco.patch',
+           '0002-Updates-num_cntrs-and-some-cleanup.patch',
+           # Patch for Cortex-A72 (for Hi1616)
+           'libpfm4-add-cortex-a72.patch',
+]
 
 dependencies = [
     ('binutils', '2.36.1')

Golden_Repo/2021a/p/PAPI/PAPI-6.0.0.1-70887df7-GCCcore-10.3.0.eb

@@ -39,7 +39,10 @@ sources = [{
         'keep_git_dir': True,
     },
 }]
-patches = ['PAPI-6.0.0.1-add-cortex-a72.patch']
+patches = [
+            'PAPI-6.0.0.1-add-cortex-a72.patch',
+            'PAPI-6.0.0.1-add-kunpeng.patch'
+]
 
 builddependencies = [
     ('binutils', '2.36.1')