From 3805fe7a057ddd64d80e12659be2f762f35305bc Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Wed, 23 Aug 2023 15:20:00 +0200 Subject: Do not embed git hashes in the library --- SConscript | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SConscript b/SConscript index 75aedbf1c..011d3e993 100644 --- a/SConscript +++ b/SConscript @@ -215,10 +215,7 @@ def resolve_includes(target, source, env): def create_version_file(target, source, env): # Generate string with build options library version to embed in the library: - try: - git_hash = subprocess.check_output(["git", "rev-parse", "HEAD"]) - except (OSError, subprocess.CalledProcessError): - git_hash="unknown" + git_hash="unknown" build_info = "\"arm_compute_version=%s Build options: %s Git hash=%s\"" % (VERSION, vars.args, git_hash.strip()) with open(target[0].get_path(), "w") as fd: -- cgit v1.2.3 From d8e99415d756e89043ed3d9469e450c7fab776d3 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Wed, 23 Aug 2023 15:25:29 +0200 Subject: Use local logo, not GitHub --- README.md | 2 +- docs/header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8585ddd94..976d087b7 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@
-

+

# Compute Library ![](https://img.shields.io/badge/latest_release-23.05.1-green) diff --git a/docs/header.html b/docs/header.html index 5dc7a0941..8d40d4b75 100644 --- a/docs/header.html +++ b/docs/header.html @@ -26,7 +26,7 @@ $extrastylesheet - Compute Library + Compute Library
-- cgit v1.2.3 From 28f463fb8e0c98f60eff67db418ecfe06915e083 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Wed, 23 Aug 2023 15:26:17 +0200 Subject: Use local files from libjs-mathjax, not cdn.mathjax.org --- docs/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Doxyfile b/docs/Doxyfile index a6735ebdb..d79386468 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -1555,7 +1555,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: https://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_RELPATH = https://cdn.mathjax.org/mathjax/latest +MATHJAX_RELPATH = ../../../javascript/mathjax # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -- cgit v1.2.3 From a3f7d93d718f58269c7228331f899446e204dbb6 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Wed, 23 Aug 2023 15:54:50 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...01-Do-not-embed-git-hashes-in-the-library.patch | 24 +++++++++++++++ .../patches/0002-Use-local-logo-not-GitHub.patch | 35 ++++++++++++++++++++++ ...iles-from-libjs-mathjax-not-cdn.mathjax.o.patch | 21 +++++++++++++ debian/patches/series | 3 ++ 4 files changed, 83 insertions(+) create mode 100644 debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch create mode 100644 debian/patches/0002-Use-local-logo-not-GitHub.patch create mode 100644 debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch b/debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch new file mode 100644 index 000000000..4f94144f9 --- /dev/null +++ b/debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch @@ -0,0 +1,24 @@ +From: Emanuele Rocca +Date: Wed, 23 Aug 2023 15:20:00 +0200 +Subject: Do not embed git hashes in the library + +--- + SConscript | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/SConscript b/SConscript +index 75aedbf..011d3e9 100644 +--- a/SConscript ++++ b/SConscript +@@ -215,10 +215,7 @@ def resolve_includes(target, source, env): + + def create_version_file(target, source, env): + # Generate string with build options library version to embed in the library: +- try: +- git_hash = subprocess.check_output(["git", "rev-parse", "HEAD"]) +- except (OSError, subprocess.CalledProcessError): +- git_hash="unknown" ++ git_hash="unknown" + + build_info = "\"arm_compute_version=%s Build options: %s Git hash=%s\"" % (VERSION, vars.args, git_hash.strip()) + with open(target[0].get_path(), "w") as fd: diff --git a/debian/patches/0002-Use-local-logo-not-GitHub.patch b/debian/patches/0002-Use-local-logo-not-GitHub.patch new file mode 100644 index 000000000..a610f5fff --- /dev/null +++ b/debian/patches/0002-Use-local-logo-not-GitHub.patch @@ -0,0 +1,35 @@ +From: Emanuele Rocca +Date: Wed, 23 Aug 2023 15:25:29 +0200 +Subject: Use local logo, not GitHub + +--- + README.md | 2 +- + docs/header.html | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index 8585ddd..976d087 100644 +--- a/README.md ++++ b/README.md +@@ -13,7 +13,7 @@ + +
+
+-

++

+
+ + # Compute Library ![](https://img.shields.io/badge/latest_release-23.05.1-green) +diff --git a/docs/header.html b/docs/header.html +index 5dc7a09..8d40d4b 100644 +--- a/docs/header.html ++++ b/docs/header.html +@@ -26,7 +26,7 @@ $extrastylesheet + + + +- Compute Library ++ Compute Library + +
+
diff --git a/debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch b/debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch new file mode 100644 index 000000000..2ff23fcef --- /dev/null +++ b/debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch @@ -0,0 +1,21 @@ +From: Emanuele Rocca +Date: Wed, 23 Aug 2023 15:26:17 +0200 +Subject: Use local files from libjs-mathjax, not cdn.mathjax.org + +--- + docs/Doxyfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/Doxyfile b/docs/Doxyfile +index a6735eb..d793864 100644 +--- a/docs/Doxyfile ++++ b/docs/Doxyfile +@@ -1555,7 +1555,7 @@ MATHJAX_FORMAT = HTML-CSS + # The default value is: https://cdn.mathjax.org/mathjax/latest. + # This tag requires that the tag USE_MATHJAX is set to YES. + +-MATHJAX_RELPATH = https://cdn.mathjax.org/mathjax/latest ++MATHJAX_RELPATH = ../../../javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax + # extension names that should be enabled during MathJax rendering. For example diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..7bff7a730 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-Do-not-embed-git-hashes-in-the-library.patch +0002-Use-local-logo-not-GitHub.patch +0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch -- cgit v1.2.3 From b250ecdc96b4c9125cb853f58bf5b0f712bbb164 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 24 Aug 2023 21:15:06 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...01-Do-not-embed-git-hashes-in-the-library.patch | 24 +++++++++++ .../patches/0002-Use-local-logo-not-GitHub.patch | 35 +++++++++++++++ ...iles-from-libjs-mathjax-not-cdn.mathjax.o.patch | 21 +++++++++ ...2-Split-assembler-block-in-a32_merge_floa.patch | 50 ++++++++++++++++++++++ debian/patches/series | 4 ++ 5 files changed, 134 insertions(+) create mode 100644 debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch create mode 100644 debian/patches/0002-Use-local-logo-not-GitHub.patch create mode 100644 debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch create mode 100644 debian/patches/0004-GEMM-AArch32-Split-assembler-block-in-a32_merge_floa.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch b/debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch new file mode 100644 index 000000000..440941576 --- /dev/null +++ b/debian/patches/0001-Do-not-embed-git-hashes-in-the-library.patch @@ -0,0 +1,24 @@ +From: Emanuele Rocca +Date: Wed, 23 Aug 2023 15:20:00 +0200 +Subject: Do not embed git hashes in the library + +--- + SConscript | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/SConscript b/SConscript +index 467f84c..6305bec 100644 +--- a/SConscript ++++ b/SConscript +@@ -254,10 +254,7 @@ def resolve_includes(target, source, env): + + def create_version_file(target, source, env): + # Generate string with build options library version to embed in the library: +- try: +- git_hash = subprocess.check_output(["git", "rev-parse", "HEAD"]) +- except (OSError, subprocess.CalledProcessError): +- git_hash="unknown" ++ git_hash="unknown" + + build_options = str(vars.args).replace('"', '\\"') + build_info = "\"arm_compute_version=%s Build options: %s Git hash=%s\"" % (VERSION,build_options, git_hash.strip()) diff --git a/debian/patches/0002-Use-local-logo-not-GitHub.patch b/debian/patches/0002-Use-local-logo-not-GitHub.patch new file mode 100644 index 000000000..160855114 --- /dev/null +++ b/debian/patches/0002-Use-local-logo-not-GitHub.patch @@ -0,0 +1,35 @@ +From: Emanuele Rocca +Date: Wed, 23 Aug 2023 15:25:29 +0200 +Subject: Use local logo, not GitHub + +--- + README.md | 2 +- + docs/header.html | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index a8f0def..d5d19e0 100644 +--- a/README.md ++++ b/README.md +@@ -13,7 +13,7 @@ + +
+
+-

++

+
+ + # Compute Library ![](https://img.shields.io/badge/latest_release-23.08-green) +diff --git a/docs/header.html b/docs/header.html +index 5dc7a09..8d40d4b 100644 +--- a/docs/header.html ++++ b/docs/header.html +@@ -26,7 +26,7 @@ $extrastylesheet + + + +- Compute Library ++ Compute Library + +
+
diff --git a/debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch b/debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch new file mode 100644 index 000000000..56d60d113 --- /dev/null +++ b/debian/patches/0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch @@ -0,0 +1,21 @@ +From: Emanuele Rocca +Date: Wed, 23 Aug 2023 15:26:17 +0200 +Subject: Use local files from libjs-mathjax, not cdn.mathjax.org + +--- + docs/Doxyfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/Doxyfile b/docs/Doxyfile +index 1654d16..fea87b1 100644 +--- a/docs/Doxyfile ++++ b/docs/Doxyfile +@@ -1556,7 +1556,7 @@ MATHJAX_FORMAT = HTML-CSS + # The default value is: https://cdn.mathjax.org/mathjax/latest. + # This tag requires that the tag USE_MATHJAX is set to YES. + +-MATHJAX_RELPATH = https://cdn.mathjax.org/mathjax/latest ++MATHJAX_RELPATH = ../../../javascript/mathjax + + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax + # extension names that should be enabled during MathJax rendering. For example diff --git a/debian/patches/0004-GEMM-AArch32-Split-assembler-block-in-a32_merge_floa.patch b/debian/patches/0004-GEMM-AArch32-Split-assembler-block-in-a32_merge_floa.patch new file mode 100644 index 000000000..823092fb2 --- /dev/null +++ b/debian/patches/0004-GEMM-AArch32-Split-assembler-block-in-a32_merge_floa.patch @@ -0,0 +1,50 @@ +From: David Mansell +Date: Wed, 23 Aug 2023 16:00:13 +0100 +Subject: GEMM: AArch32: Split assembler block in a32_merge_float_8x6.hpp + +Inline assembler blocks attempting to bind 8 integer +registers don't compile in certain configurations (notably GCC 13.2 debug +builds with -O0 -g). Fix this by splitting the offending block into two +separate parts (straightforward as there is no flow control in the block). + +Fixes: COMPMID-6532 +Signed-off-by: David Mansell +Change-Id: I80e9a10e6a91574176d50e63c45fab055aefa659 +--- + src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp b/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp +index bea455c..989bb17 100644 +--- a/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp ++++ b/src/core/NEON/kernels/arm_gemm/merges/a32_merge_float_8x6.hpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2017-2018 Arm Limited. ++ * Copyright (c) 2017-2018,2023 Arm Limited. + * + * SPDX-License-Identifier: MIT + * +@@ -274,7 +274,13 @@ void MergeResults<8, 6, false>(float *out, const float *in, const int ldout, con + "VMIN.f32 q6, q6, %q[maxv]\n" + "VMIN.f32 q7, q7, %q[maxv]\n" + "VST1.32 {d12-d15}, [%[outptr3]]!\n" ++ : [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), ++ [inptr] "+r" (inptr) ++ : [minv] "w" (minv), [maxv] "w" (maxv), [biasptr] "r" (biasptr) ++ : "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "memory" ++ ); + ++ __asm __volatile ( + // Rows 4-5 + "VLD1.32 {d8-d11}, [%[inptr]]!\n" + "VLD1.32 {d12-d15}, [%[inptr]]!\n" +@@ -296,7 +302,7 @@ void MergeResults<8, 6, false>(float *out, const float *in, const int ldout, con + "VMIN.f32 q6, q6, %q[maxv]\n" + "VMIN.f32 q7, q7, %q[maxv]\n" + "VST1.32 {d12-d15}, [%[outptr5]]!\n" +- : [outptr0] "+r" (outptr0), [outptr1] "+r" (outptr1), [outptr2] "+r" (outptr2), [outptr3] "+r" (outptr3), ++ : [outptr3] "+r" (outptr3), + [outptr4] "+r" (outptr4), [outptr5] "+r" (outptr5), [inptr] "+r" (inptr) + : [minv] "w" (minv), [maxv] "w" (maxv), [biasptr] "r" (biasptr) + : "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "memory" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..a6f4a9572 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +0001-Do-not-embed-git-hashes-in-the-library.patch +0002-Use-local-logo-not-GitHub.patch +0003-Use-local-files-from-libjs-mathjax-not-cdn.mathjax.o.patch +0004-GEMM-AArch32-Split-assembler-block-in-a32_merge_floa.patch -- cgit v1.2.3