Merge ~lucaskanashiro/ubuntu/+source/ruby2.5:bionic-arm64-optimization into ubuntu/+source/ruby2.5:ubuntu/bionic-devel

[Lucas Kanashiro]

Apply upstream patch to optimize performance on arm64 in Bionic.

Upstream patch: https://github.com/ruby/ruby/commit/511b55bcefc81c03
LP bug: https://bugs.launchpad.net/ubuntu/+source/ruby2.7/+bug/1901074

I was not able to build this package from the git-ubuntu branch, there is some mismatch with the upstream tarball in the archive. So I am submitting the changes here using the git-ubuntu repo to facilitate the review but I built the package pulling the source package from LP (the changes are the same I am proposing here).

Moreover, I needed to add some extra changes to fix a FTBFS and also DEP-8 tests. I was kind of surprised that autopkgtest never passed for ruby2.5.

PPA: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ruby2.7-arm64-optimization/+packages

Autopkgtest is still happy:

autopkgtest [17:57:34]: @@@@@@@@@@@@@@@@@@@@ summary
run-all PASS
bundled-gems PASS
builtin-extensions PASS
rubyconfig PASS

[Bryce Harrington (bryce)]

### Branch Review ###

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [x] patches have correct DEP3 metadata
    + Need bug links, see below

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [x] autopkgtest against the PPA package passes
    + see below
  - [-] sanity checks test fine

I didn't attempt to build locally from git-ubuntu, but the PPA seems to have built fine. I did try running the autopkgtest locally using the ppa, but it fails on the run-all test:

autopkgtest [22:24:33]: test rubyconfig: -----------------------]
autopkgtest [22:24:33]: test rubyconfig: - - - - - - - - - - results - - - - - - - - - -
rubyconfig PASS
autopkgtest [22:24:33]: @@@@@@@@@@@@@@@@@@@@ summary
run-all FAIL non-zero exit status 1
bundled-gems PASS
builtin-extensions PASS
rubyconfig PASS

Here's the specific test case output:

FAIL test/rubygems/test_gem_util.rb
-----------------------------------

[/var/lib/gems/2.5.0/specifications/bundler-1.16.1.gemspec] isn't a Gem::Specification (NilClass instead).
[/var/lib/gems/2.5.0/specifications/bundler-audit-1.0.0.gemspec] isn't a Gem::Specification (NilClass instead).
Run options: -v --excludes-dir=test/excludes/ --excludes-dir=debian/tests/excludes/any/ --excludes-dir=debian/tests/excludes/amd64/ --name=!/memory_leak/

# Running tests:

[1/5] TestGemUtil#test_silent_system = 0.05 s
[2/5] TestGemUtil#test_class_popen = 0.04 s
[3/5] TestGemUtil#test_traverse_parents = 0.00 s
[4/5] TestGemUtil#test_traverse_parents_does_not_crash_on_permissions_error = 0.01 s
[5/5] TestGemUtil#test_linked_list_find = 0.00 s

  1) Failure:
TestGemUtil#test_traverse_parents_does_not_crash_on_permissions_error [/tmp/autopkgtest.XIAQZ1/autopkgtest_tmp/test/rubygems/test_gem_util.rb:43]:
--- expected
+++ actual
@@ -1 +1 @@
-"/tmp/test_rubygems_103177/d"
+"/tmp/test_rubygems_103177/d/e/f"

Finished tests in 0.105744s, 47.2839 tests/s, 94.5678 assertions/s.
5 tests, 10 assertions, 1 failures, 0 errors, 0 skips

The DEP3 for the added patches miss their upstream bug links. The arm patch doesn't appear to have an actual bug report afaict but there is a PR with a bit of context:

https://github.com/ruby/ruby/pull/3393
https://bugs.ruby-lang.org/issues/14655

Inline below are some refactoring and typo fixing suggestions.

### SRU Text Review ###

Some suggestions to help improve the SRU text to help it pass.

The timezone patch doesn't appear to have a ubuntu bug. I gather this is added strictly just to fix test suite failure, which is great, and as such might not ...

review: Needs Fixing

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Bryce! I believe I addressed all your comments, it is up for review again. I uploaded a new version to the PPA with the all the improvements.

Regarding the autopkgtest failure I was not able to reproduce it, I ran it locally multiple times with different backends and all of them passed:

autopkgtest [18:38:52]: @@@@@@@@@@@@@@@@@@@@ summary
run-all PASS
bundled-gems PASS
builtin-extensions PASS
rubyconfig PASS

I tested with the commands below:

$ autopkgtest -U -s ruby2.5_2.5.1-1ubuntu1.7~ppa4_amd64.changes -- lxd ubuntu-daily:bionic
$ autopkgtest -U -s ruby2.5_2.5.1-1ubuntu1.7~ppa4_amd64.changes -- qemu @autopkgtest-bionic.cfg
$ cat autopkgtest-bionic.cfg
--ram-size=2046
/home/lucas/autopkgtest/autopkgtest-bionic-amd64.img

Here you can find the log of one of my executions: https://paste.ubuntu.com/p/H2fHr4y7Yb/

[Bryce Harrington (bryce)]

Looks good, +1.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Bryce! Uploaded:

$ git push pkg upload/2.5.1-1ubuntu1.7
Enumerating objects: 43, done.
Counting objects: 100% (43/43), done.
Delta compression using up to 32 threads
Compressing objects: 100% (32/32), done.
Writing objects: 100% (33/33), 8.03 KiB | 4.01 MiB/s, done.
Total 33 (delta 21), reused 2 (delta 1)
To ssh://git.launchpad.net/ubuntu/+source/ruby2.5
 * [new tag] upload/2.5.1-1ubuntu1.7 -> upload/2.5.1-1ubuntu1.7

$ dput ubuntu ../ruby2.5_2.5.1-1ubuntu1.7_source.changes
Checking signature on .changes
gpg: ../ruby2.5_2.5.1-1ubuntu1.7_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../ruby2.5_2.5.1-1ubuntu1.7.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ruby2.5_2.5.1-1ubuntu1.7.dsc: done.
  Uploading ruby2.5_2.5.1-1ubuntu1.7.debian.tar.xz: done.
  Uploading ruby2.5_2.5.1-1ubuntu1.7_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 08fcc18..c1b4e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+ruby2.5 (2.5.1-1ubuntu1.7) bionic; urgency=medium
+
+  * d/p/arm64-optimizations.patch: enable arm64 optimizations that exist
+    for power/x86. It includes enabling unaligned memory access, gc and
+    vm_exec.c optimizations (LP: #1901074).
+  * Fix FTBFS, many tests were failing during the build (LP: #1903902).
+    - Add missing b-d on tzdata.
+  * Fix DEP-8 tests (LP: #1903905).
+    - Backport patches to fix Kiritimati TZ tests:
+      + 0029-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-1-.patch
+      + 0030-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-2-.patch
+    - d/t/control: add restriction to allow-stderr. The rubyconfig test calls
+      dpkg-architecture which is returning a warning in Bionic.
+    - d/t/bundled-gems: skip gems which do not match upstream expectations.
+      Some gems listed as bundled by upstream are not satisfied by the Ubuntu
+      Bionic archive.
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 05 Nov 2020 10:30:22 -0300
+
 ruby2.5 (2.5.1-1ubuntu1.6) bionic-security; urgency=medium
 
   * SECURITY UPDATE: NULL injection vulnerability
diff --git a/debian/control b/debian/control
index 50986d7..2a2cbe8 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: bison,
                procps,
                rubygems-integration (>= 1.6),
                systemtap-sdt-dev [linux-any],
+               tzdata,
                zlib1g-dev
 Standards-Version: 4.1.2
 Homepage: http://www.ruby-lang.org/
diff --git a/debian/patches/0029-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-1-.patch b/debian/patches/0029-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-1-.patch
new file mode 100644
index 0000000..374cc5e
--- /dev/null
+++ b/debian/patches/0029-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-1-.patch
@@ -0,0 +1,58 @@
+From: Lucas Kanashiro <[e-mail]>
+Date: Thu, 5 Nov 2020 17:17:25 -0300
+Subject: Backport upstream patch to fix Kiritimati TZ test [1/2]
+
+Original commit message:
+
+test_time_tz.rb: Kiritimati tzdata fix
+
+* test/ruby/test_time_tz.rb (TestTimeTZ#test_pacific_kiritimati):
+  fix the expected data at the skip of New Year's Eve 1994.
+  [Bug #14655]
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+
+Origin: upstream, https://github.com/ruby/ruby/commit/2965c2d4df7
+Bug-Upstream: https://bugs.ruby-lang.org/issues/14655
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby2.5/+bug/1903905
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+Last-Updated: 2020-11-04
+---
+ test/ruby/test_time_tz.rb | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
+index 52d8bf8..ff3169e 100644
+--- a/test/ruby/test_time_tz.rb
++++ b/test/ruby/test_time_tz.rb
+@@ -91,6 +91,9 @@ def group_by(e, &block)
+       end
+     end
+   }
++  CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {
++    Time.local(1994, 12, 31, 0, 0, 0).year == 1995
++  }
+ 
+   def time_to_s(t)
+     t.to_s
+@@ -180,9 +183,17 @@ def test_europe_lisbon
+ 
+   def test_pacific_kiritimati
+     with_tz(tz="Pacific/Kiritimati") {
+-      assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])
+-      assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,1,0,0,0])
+-      assert_time_constructor(tz, "1995-01-02 23:59:59 +1400", :local, [1995,1,1,23,59,59])
++      assert_time_constructor(tz, "1994-12-30 00:00:00 -1000", :local, [1994,12,30,0,0,0])
++      assert_time_constructor(tz, "1994-12-30 23:59:59 -1000", :local, [1994,12,30,23,59,59])
++      if CORRECT_KIRITIMATI_SKIP_1994
++        assert_time_constructor(tz, "1995-01-01 00:00:00 +1400", :local, [1994,12,31,0,0,0])
++        assert_time_constructor(tz, "1995-01-01 23:59:59 +1400", :local, [1994,12,31,23,59,59])
++        assert_time_constructor(tz, "1995-01-01 00:00:00 +1400", :local, [1995,1,1,0,0,0])
++      else
++        assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])
++        assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,1,0,0,0])
++        assert_time_constructor(tz, "1995-01-02 23:59:59 +1400", :local, [1995,1,1,23,59,59])
++      end
+       assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,2,0,0,0])
+     }
+   end
diff --git a/debian/patches/0030-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-2-.patch b/debian/patches/0030-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-2-.patch
new file mode 100644
index 0000000..a6c0b90
--- /dev/null
+++ b/debian/patches/0030-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-2-.patch
@@ -0,0 +1,46 @@
+From: Lucas Kanashiro <[e-mail]>
+Date: Thu, 5 Nov 2020 17:21:47 -0300
+Subject: Backport upstream patch to fix Kiritimati TZ test [2/2]
+
+Original commit message:
+
+test_time_tz.rb: Kiritimati tzdata fix
+
+* test/ruby/test_time_tz.rb (gen_zdump_test): fix the expected
+  data at the Kiritimati's skip of New Year's Eve 1994.
+  [Bug #14655]
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+
+Origin: upstream, https://github.com/ruby/ruby/commit/584b5929f9b7
+Bug-Upstream: https://bugs.ruby-lang.org/issues/14655
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby2.5/+bug/1903905
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+Last-Updated: 2020-11-05
+---
+ test/ruby/test_time_tz.rb | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
+index ff3169e..dad8e67 100644
+--- a/test/ruby/test_time_tz.rb
++++ b/test/ruby/test_time_tz.rb
+@@ -381,9 +381,18 @@ def self.gen_zdump_test(data)
+ Europe/London  Sun Aug 10 01:00:00 1947 UTC = Sun Aug 10 02:00:00 1947 BST isdst=1 gmtoff=3600
+ Europe/London  Sun Nov  2 01:59:59 1947 UTC = Sun Nov  2 02:59:59 1947 BST isdst=1 gmtoff=3600
+ Europe/London  Sun Nov  2 02:00:00 1947 UTC = Sun Nov  2 02:00:00 1947 GMT isdst=0 gmtoff=0
++End
++  if CORRECT_KIRITIMATI_SKIP_1994
++    gen_zdump_test <<'End'
++Pacific/Kiritimati  Sat Dec 31 09:59:59 1994 UTC = Fri Dec 30 23:59:59 1994 LINT isdst=0 gmtoff=-36000
++Pacific/Kiritimati  Sat Dec 31 10:00:00 1994 UTC = Sun Jan  1 00:00:00 1995 LINT isdst=0 gmtoff=50400
++End
++  else
++    gen_zdump_test <<'End'
+ Pacific/Kiritimati  Sun Jan  1 09:59:59 1995 UTC = Sat Dec 31 23:59:59 1994 LINT isdst=0 gmtoff=-36000
+ Pacific/Kiritimati  Sun Jan  1 10:00:00 1995 UTC = Mon Jan  2 00:00:00 1995 LINT isdst=0 gmtoff=50400
+ End
++  end
+   gen_zdump_test <<'End' if has_right_tz
+ right/America/Los_Angeles  Fri Jun 30 23:59:60 1972 UTC = Fri Jun 30 16:59:60 1972 PDT isdst=1 gmtoff=-25200
+ right/America/Los_Angeles  Wed Dec 31 23:59:60 2008 UTC = Wed Dec 31 15:59:60 2008 PST isdst=0 gmtoff=-28800
diff --git a/debian/patches/arm64-optimizations.patch b/debian/patches/arm64-optimizations.patch
new file mode 100644
index 0000000..1e98b50
--- /dev/null
+++ b/debian/patches/arm64-optimizations.patch
@@ -0,0 +1,179 @@
+From: Lucas Kanashiro <[e-mail]>
+Date: Thu, 5 Nov 2020 10:27:17 -0300
+Subject: Backport some arm64 optimizations
+
+Original commit message:
+
+From 511b55bcefc81c036294dc9a544d14bd342acd3b Mon Sep 17 00:00:00 2001
+From: AGSaidi <[e-mail]>
+Date: Thu, 13 Aug 2020 12:15:54 -0500
+Subject: [PATCH] Enable arm64 optimizations that exist for power/x86 (#3393)
+
+* Enable unaligned accesses on arm64
+
+64-bit Arm platforms support unaligned accesses.
+
+Running the string benchmarks this change improves performance
+by an average of 1.04x, min .96x, max 1.21x, median 1.01x
+
+* arm64 enable gc optimizations
+
+Similar to x86 and powerpc optimizations.
+
+|       |compare-ruby|built-ruby|
+|:------|-----------:|---------:|
+|hash1  |       0.225|     0.237|
+|       |           -|     1.05x|
+|hash2  |       0.110|     0.110|
+|       |       1.00x|         -|
+
+* vm_exec.c: improve performance for arm64
+
+|                               |compare-ruby|built-ruby|
+|:------------------------------|-----------:|---------:|
+|vm_array                       |     26.501M|   27.959M|
+|                               |           -|     1.06x|
+|vm_attr_ivar                   |     21.606M|   31.429M|
+|                               |           -|     1.45x|
+|vm_attr_ivar_set               |     21.178M|   26.113M|
+|                               |           -|     1.23x|
+|vm_backtrace                   |       6.621|     6.668|
+|                               |           -|     1.01x|
+|vm_bigarray                    |     26.205M|   29.958M|
+|                               |           -|     1.14x|
+|vm_bighash                     |    504.155k|  479.306k|
+|                               |       1.05x|         -|
+|vm_block                       |     16.692M|   21.315M|
+|                               |           -|     1.28x|
+|block_handler_type_iseq        |       5.083|     7.004|
+|                               |           -|     1.38x|
+
+Origin: upstream, https://github.com/ruby/ruby/commit/511b55bcefc81c03
+Bug-Upstream: https://github.com/ruby/ruby/pull/3393
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby2.7/+bug/1901074
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+Last-Updated: 2020-11-05
+---
+ gc.c                   | 12 ++++++++++++
+ gc.h                   |  2 ++
+ include/ruby/defines.h |  2 +-
+ regint.h               |  2 +-
+ siphash.c              |  2 +-
+ st.c                   |  2 +-
+ vm_exec.c              |  8 ++++++++
+ 7 files changed, 26 insertions(+), 4 deletions(-)
+
+diff --git a/gc.c b/gc.c
+index f031861..8cf2fbb 100644
+--- a/gc.c
++++ b/gc.c
+@@ -975,6 +975,18 @@ tick(void)
+     return val;
+ }
+ 
++#elif defined(__aarch64__) &&  defined(__GNUC__)
++typedef unsigned long tick_t;
++#define PRItick "lu"
++
++static __inline__ tick_t
++tick(void)
++{
++    unsigned long val;
++    __asm__ __volatile__ ("mrs %0, cntvct_el0", : "=r" (val));
++    return val;
++}
++
+ #elif defined(_WIN32) && defined(_MSC_VER)
+ #include <intrin.h>
+ typedef unsigned __int64 tick_t;
+diff --git a/gc.h b/gc.h
+index 2c91e06..0f8a56f 100644
+--- a/gc.h
++++ b/gc.h
+@@ -6,6 +6,8 @@
+ #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
+ #elif defined(__i386) && defined(__GNUC__)
+ #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
++#elif defined(__aarch64__) && defined(__GNUC__)
++#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("mov\t%0, sp" : "=r" (*(p)))
+ #else
+ NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
+ #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
+diff --git a/include/ruby/defines.h b/include/ruby/defines.h
+index 9940c93..fff794e 100644
+--- a/include/ruby/defines.h
++++ b/include/ruby/defines.h
+@@ -358,7 +358,7 @@ void rb_ia64_flushrs(void);
+ #ifndef UNALIGNED_WORD_ACCESS
+ # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
+-     defined(__powerpc64__) || \
++     defined(__powerpc64__) || defined(__aarch64__) || \
+      defined(__mc68020__)
+ #   define UNALIGNED_WORD_ACCESS 1
+ # else
+diff --git a/regint.h b/regint.h
+index a2f5bbb..0740429 100644
+--- a/regint.h
++++ b/regint.h
+@@ -52,7 +52,7 @@
+ #ifndef UNALIGNED_WORD_ACCESS
+ # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
+-     defined(__powerpc64__) || \
++     defined(__powerpc64__) || defined(__aarch64__) || \
+      defined(__mc68020__)
+ #  define UNALIGNED_WORD_ACCESS 1
+ # else
+diff --git a/siphash.c b/siphash.c
+index 153d2c6..ddf8ee2 100644
+--- a/siphash.c
++++ b/siphash.c
+@@ -30,7 +30,7 @@
+ #ifndef UNALIGNED_WORD_ACCESS
+ # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
+-     defined(__powerpc64__) || \
++     defined(__powerpc64__) || defined(__aarch64__) || \
+      defined(__mc68020__)
+ #   define UNALIGNED_WORD_ACCESS 1
+ # endif
+diff --git a/st.c b/st.c
+index 9740e02..93635e6 100644
+--- a/st.c
++++ b/st.c
+@@ -1744,7 +1744,7 @@ st_values_check(st_table *tab, st_data_t *values, st_index_t size,
+ #ifndef UNALIGNED_WORD_ACCESS
+ # if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+      defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
+-     defined(__powerpc64__) || \
++     defined(__powerpc64__) || defined(__aarch64__) || \
+      defined(__mc68020__)
+ #   define UNALIGNED_WORD_ACCESS 1
+ # endif
+diff --git a/vm_exec.c b/vm_exec.c
+index 87e9714..65bbca2 100644
+--- a/vm_exec.c
++++ b/vm_exec.c
+@@ -27,6 +27,9 @@ static void vm_analysis_insn(int insn);
+ #elif defined(__GNUC__) && defined(__powerpc64__)
+ #define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
+ 
++#elif defined(__GNUC__) && defined(__aarch64__)
++#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("x" reg)
++
+ #else
+ #define DECL_SC_REG(type, r, reg) register type reg_##r
+ #endif
+@@ -74,6 +77,11 @@ vm_exec_core(rb_execution_context_t *ec, VALUE initial)
+     DECL_SC_REG(rb_control_frame_t *, cfp, "15");
+ #define USE_MACHINE_REGS 1
+ 
++#elif defined(__GNUC__) && defined(__aarch64__)
++    DECL_SC_REG(const VALUE *, pc, "19");
++    DECL_SC_REG(rb_control_frame_t *, cfp, "20");
++#define USE_MACHINE_REGS 1
++
+ #else
+     register rb_control_frame_t *reg_cfp;
+     const VALUE *reg_pc;
diff --git a/debian/patches/series b/debian/patches/series
index 488ec39..44beaf8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,6 @@ CVE-2019-15845.patch
 CVE-2019-16201.patch
 CVE-2019-16254.patch
 CVE-2019-16255.patch
+arm64-optimizations.patch
+0029-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-1-.patch
+0030-Backport-upstream-patch-to-fix-Kiritimati-TZ-test-2-.patch
diff --git a/debian/tests/bundled-gems b/debian/tests/bundled-gems
index 5767c70..4ee2d21 100755
--- a/debian/tests/bundled-gems
+++ b/debian/tests/bundled-gems
@@ -1,9 +1,32 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
+bionic_meets_gem_requirement() {
+    local gem="$1"
+    # The gems listed below do not match what ruby upstream expects.
+    # * power_assert: upstream expects version >= 1.1.1. Bionic has version 0.3.0-1
+    #   but actually it contains 0.2.7, look at the gemspec:
+    #   /usr/share/rubygems-integration/all/specifications/power_assert-0.2.7.gemspec
+    # * test-unit: upstream expects version >= 3.2.7. Bionic has version 3.2.5-1.
+    # * xmlrpc: upstream expects version >= 0.3.0. This package is not available in
+    #   Bionic, just from Focal onwards.
+    # Also see LP #1903905.
+    local gems_not_expected_to_work=(power_assert test-unit xmlrpc)
+
+    for gem_skipped in "${gems_not_expected_to_work[@]}"; do
+        if [[ "${gem}" == "${gem_skipped}" ]]; then
+	    echo "${gem} in Bionic does not match what ruby upstream expects for this version."
+	    return 1
+	fi
+    done
+    return 0
+}
+
 rc=0
 while read gem version repository; do
+  bionic_meets_gem_requirement "${gem}" || continue
+
   if ruby2.5 -e "gem '${gem}', '>= ${version}'"; then
     echo "${gem} (>= ${version}) OK"
   else
diff --git a/debian/tests/control b/debian/tests/control
index d5c2ee0..2b0bab8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,3 @@
 Tests: run-all bundled-gems builtin-extensions rubyconfig
 Depends: @
+Restrictions: allow-stderr