[jdk21u-dev] RFR: 8310513: [s390x] Intrinsify recursive ObjectMonitor locking

[Amit Kumar]

On Fri, 26 Apr 2024 16:34:25 GMT, Amit Kumar <amitkumar at openjdk.org> wrote:

> Hi all,
> 
> This pull request contains a backport of commit [47df1459](https://github.com/openjdk/jdk/commit/47df14590c003ccb1607ec0edfe999fcf2aebd86) from the [openjdk/jdk](https://git.openjdk.org/jdk) repository.
> 
> The commit being backported was authored by Amit Kumar on 10 Apr 2024 and was reviewed by Lutz Schmidt and Martin Doerr.
> 
> Thanks!
> 
> Benchmarking: 
> 
> ./build/linux-s390x-server-release/jdk/bin/java -Xms4g -Xmx4g -jar dacapo-9.12-MR1-bach.jar h2 -s huge -t 1 -n 1
> 
> Without the patch:
> 
> ===== DaCapo 9.12-MR1 h2 PASSED in 209768 msec ===== 
> ===== DaCapo 9.12-MR1 h2 PASSED in 197472 msec =====
> ===== DaCapo 9.12-MR1 h2 PASSED in 222872 msec =====
> ===== DaCapo 9.12-MR1 h2 PASSED in 215725 msec =====
> 
> 
> with patch: 
> ===== DaCapo 9.12-MR1 h2 PASSED in 171055 msec =====
> ===== DaCapo 9.12-MR1 h2 PASSED in 169696 msec =====
> ===== DaCapo 9.12-MR1 h2 PASSED in 174032 msec =====
> ===== DaCapo 9.12-MR1 h2 PASSED in 167271 msec =====

There were conflicts in the  copyright header. 


diff --cc src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 8a56f3e4c2b,fd04a66a843..00000000000
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@@ -1,6 -1,6 +1,11 @@@
  /*
++<<<<<<< HEAD
 + * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
 + * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
++=======
+  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
++>>>>>>> 47df14590c0 (8310513: [s390x] Intrinsify recursive ObjectMonitor locking)
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it

-------------

PR Comment: https://git.openjdk.org/jdk21u-dev/pull/537#issuecomment-2083036456