From 249b9345b20be7f147fd324f90075a9ff7996718 Mon Sep 17 00:00:00 2001
From: CoreRasurae <luis.p.mendes@gmail.com>
Date: Mon, 16 Dec 2019 15:05:18 +0000
Subject: [PATCH] Adding derived BarrierSupportMax256WorkGroupTest from
BarrierSupportTest that limits the max workgroup size to 256
---
.../BarrierSupportMax256WorkGroupTest.java | 50 +++++++++++++++++++
.../aparapi/runtime/BarrierSupportTest.java | 10 ++--
2 files changed, 55 insertions(+), 5 deletions(-)
create mode 100644 src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java
diff --git a/src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java b/src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java
new file mode 100644
index 00000000..b00fe7ea
--- /dev/null
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportMax256WorkGroupTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016 - 2018 Syncleus, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.aparapi.runtime;
+
+import com.aparapi.Kernel;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.JavaDevice;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.internal.kernel.KernelManager;
+
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+
+public class BarrierSupportMax256WorkGroupTest extends BarrierSupportTest {
+ @Before
+ @Override
+ public void setUpBefore() throws Exception {
+ KernelManager.setKernelManager(new CLKernelManager());
+ Device device = KernelManager.instance().bestDevice();
+ assumeTrue (device != null && device instanceof OpenCLDevice);
+ openCLDevice = (OpenCLDevice) device;
+ SIZE = openCLDevice.getMaxWorkGroupSize();
+ if (SIZE > 256) {
+ SIZE = 256;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/aparapi/runtime/BarrierSupportTest.java b/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
index b6b65c67..f5bf29d0 100644
--- a/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
+++ b/src/test/java/com/aparapi/runtime/BarrierSupportTest.java
@@ -34,18 +34,18 @@ import org.junit.Before;
import org.junit.Test;
public class BarrierSupportTest {
- private static OpenCLDevice openCLDevice = null;
- private static int SIZE;
- private int[] targetArray;
+ protected static OpenCLDevice openCLDevice = null;
+ protected static int SIZE;
+ protected int[] targetArray;
- private class CLKernelManager extends KernelManager {
+ protected class CLKernelManager extends KernelManager {
@Override
protected List<Device.TYPE> getPreferredDeviceTypes() {
return Arrays.asList(Device.TYPE.ACC, Device.TYPE.GPU, Device.TYPE.CPU);
}
}
- private class JTPKernelManager extends KernelManager {
+ protected class JTPKernelManager extends KernelManager {
private JTPKernelManager() {
LinkedHashSet<Device> preferredDevices = new LinkedHashSet<Device>(1);
preferredDevices.add(JavaDevice.THREAD_POOL);
--
GitLab