Add java.util.Arrays patch to use gpu module code

Signed-off-by: Theresa Mammarella <[email protected]>
JasonFengJ9 · Mar 23, 2018 · 7ff7e19 · 7ff7e19
1 parent b6fe698
commit 7ff7e19
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/closed/make/CompileJavaModules.gmk b/closed/make/CompileJavaModules.gmk
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2018 All Rights Reserved
 # ===========================================================================
 # 
 # This code is free software; you can redistribute it and/or modify it
@@ -17,5 +17,6 @@
 # 
 # ===========================================================================
 
-java.base_COPY += ExternalMessages.properties ibm_gpu_thresholds.properties
+java.base_COPY += ExternalMessages.properties
+openj9.gpu_COPY += ibm_gpu_thresholds.properties
 
diff --git a/src/java.base/share/classes/java/util/Arrays.java b/src/java.base/share/classes/java/util/Arrays.java
@@ -1,3 +1,8 @@
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2018, 2018 All Rights Reserved.
+ * ===========================================================================
+ */
 /*
  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -143,6 +148,9 @@ static void rangeCheck(int arrayLength, int fromIndex, int toIndex) {
      * @param a the array to be sorted
      */
     public static void sort(int[] a) {
+        if (GPUAssistHolder.instance.trySort(a, 0, a.length)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, 0, a.length - 1, null, 0, 0);
     }
 
@@ -168,6 +176,9 @@ public static void sort(int[] a) {
      */
     public static void sort(int[] a, int fromIndex, int toIndex) {
         rangeCheck(a.length, fromIndex, toIndex);
+        if (GPUAssistHolder.instance.trySort(a, fromIndex, toIndex)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, fromIndex, toIndex - 1, null, 0, 0);
     }
 
@@ -183,6 +194,9 @@ public static void sort(int[] a, int fromIndex, int toIndex) {
      * @param a the array to be sorted
      */
     public static void sort(long[] a) {
+        if (GPUAssistHolder.instance.trySort(a, 0, a.length)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, 0, a.length - 1, null, 0, 0);
     }
 
@@ -208,6 +222,9 @@ public static void sort(long[] a) {
      */
     public static void sort(long[] a, int fromIndex, int toIndex) {
         rangeCheck(a.length, fromIndex, toIndex);
+        if (GPUAssistHolder.instance.trySort(a, fromIndex, toIndex)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, fromIndex, toIndex - 1, null, 0, 0);
     }
 
@@ -351,6 +368,9 @@ public static void sort(byte[] a, int fromIndex, int toIndex) {
      * @param a the array to be sorted
      */
     public static void sort(float[] a) {
+        if (GPUAssistHolder.instance.trySort(a, 0, a.length)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, 0, a.length - 1, null, 0, 0);
     }
 
@@ -384,6 +404,9 @@ public static void sort(float[] a) {
      */
     public static void sort(float[] a, int fromIndex, int toIndex) {
         rangeCheck(a.length, fromIndex, toIndex);
+        if (GPUAssistHolder.instance.trySort(a, fromIndex, toIndex)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, fromIndex, toIndex - 1, null, 0, 0);
     }
 
@@ -407,6 +430,9 @@ public static void sort(float[] a, int fromIndex, int toIndex) {
      * @param a the array to be sorted
      */
     public static void sort(double[] a) {
+        if (GPUAssistHolder.instance.trySort(a, 0, a.length)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, 0, a.length - 1, null, 0, 0);
     }
 
@@ -440,6 +466,9 @@ public static void sort(double[] a) {
      */
     public static void sort(double[] a, int fromIndex, int toIndex) {
         rangeCheck(a.length, fromIndex, toIndex);
+        if (GPUAssistHolder.instance.trySort(a, fromIndex, toIndex)) {
+            return;
+        }
         DualPivotQuicksort.sort(a, fromIndex, toIndex - 1, null, 0, 0);
     }