From 527766b30a6383678206d1be1f9477d1ba3f2cfc Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Tue, 15 Jan 2013 22:42:27 +0000
Subject: [PATCH] Can now use -agentpath to launch aparapi from win 32/64
---
com.amd.aparapi.jni/build.xml | 13 ++++++++-----
examples/nbody/nbody-agent.bat | 16 ++++++++++++++++
samples/life/life-agent.bat | 13 +++++++++++++
samples/mandel/mandel-agent.bat | 16 ++++++++++++++++
4 files changed, 53 insertions(+), 5 deletions(-)
create mode 100644 examples/nbody/nbody-agent.bat
create mode 100644 samples/life/life-agent.bat
create mode 100644 samples/mandel/mandel-agent.bat
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 5d70e63e..5be72c6d 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -543,6 +543,7 @@ First consider editing the properties in build.properties
<arg value="src/cpp/opencljni.cpp" />
<arg value="src/cpp/jniHelper.cpp" />
<arg value="src/cpp/clHelper.cpp" />
+ <arg value="src/cpp/agent.cpp" />
<arg value="-framework" />
<arg value="OpenCL" />
<arg value="-Wno-write-strings" />
@@ -564,13 +565,14 @@ First consider editing the properties in build.properties
<arg value="/I${java.home}\..\include\win32" />
<arg value="/Iinclude" />
<arg value="/I${amd.app.sdk.dir}\include" />
- <arg value="src\cpp\aparapi.cpp" />
+ <arg value="src/cpp/aparapi.cpp" />
<arg value="src/cpp/config.cpp" />
<arg value="src/cpp/profileInfo.cpp" />
<arg value="src/cpp/arrayBuffer.cpp" />
- <arg value="src\cpp\opencljni.cpp" />
- <arg value="src\cpp\jniHelper.cpp" />
+ <arg value="src/cpp/opencljni.cpp" />
+ <arg value="src/cpp/jniHelper.cpp" />
<arg value="src/cpp/clHelper.cpp" />
+ <arg value="src/cpp/agent.cpp" />
<arg value="/LD" />
<arg value="/link" />
<arg value="/libpath:${msvc.dir}\vc\lib\${optional.amd64.subdir}" />
@@ -597,13 +599,14 @@ First consider editing the properties in build.properties
<arg value="-shared" />
<arg value="-o" />
<arg value="${basedir}\dist\aparapi_${x86_or_x86_64}.dll" />
- <arg value="src\cpp\aparapi.cpp" />
+ <arg value="src/cpp/aparapi.cpp" />
<arg value="src/cpp/config.cpp" />
<arg value="src/cpp/profileInfo.cpp" />
<arg value="src/cpp/arrayBuffer.cpp" />
- <arg value="src\cpp\opencljni.cpp" />
+ <arg value="src/cpp/opencljni.cpp" />
<arg value="src/cpp/jniHelper.cpp" />
<arg value="src/cpp/clHelper.cpp" />
+ <arg value="src/cpp/agent.cpp" />
<arg value="-L${amd.app.sdk.dir}\lib\${x86_or_x86_64}" />
<arg value="-lOpenCL" />
</exec>
diff --git a/examples/nbody/nbody-agent.bat b/examples/nbody/nbody-agent.bat
new file mode 100644
index 00000000..2dfdc11e
--- /dev/null
+++ b/examples/nbody/nbody-agent.bat
@@ -0,0 +1,16 @@
+@echo off
+
+java ^
+ -agentpath:../../com.amd.aparapi.jni/dist/aparapi_x86_64.dll ^
+ -Dcom.amd.aparapi.useAgent=true ^
+ -Djava.library.path=..\third-party\jogamp ^
+ -Dcom.amd.aparapi.executionMode=%1 ^
+ -Dcom.amd.aparapi.enableProfiling=false ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
+ -Dbodies=%2 ^
+ -Dheight=600 ^
+ -Dwidth=600 ^
+ -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl-all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
+ com.amd.aparapi.examples.nbody.Main
+
+
diff --git a/samples/life/life-agent.bat b/samples/life/life-agent.bat
new file mode 100644
index 00000000..5b6a1a4a
--- /dev/null
+++ b/samples/life/life-agent.bat
@@ -0,0 +1,13 @@
+java ^
+ -agentpath:../../com.amd.aparapi.jni/dist/aparapi_x86_64.dll^
+ -Dcom.amd.aparapi.useAgent=true ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
+ -Dsequential=false^
+ -Dcom.amd.aparapi.executionMode=%1 ^
+ -Dcom.amd.aparapi.enableProfiling=false ^
+ -Dcom.amd.aparapi.enableVerboseJNI=false ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;life.jar ^
+ com.amd.aparapi.sample.life.Main
+
+
diff --git a/samples/mandel/mandel-agent.bat b/samples/mandel/mandel-agent.bat
new file mode 100644
index 00000000..19ebbe7b
--- /dev/null
+++ b/samples/mandel/mandel-agent.bat
@@ -0,0 +1,16 @@
+java ^
+ -agentpath:../../com.amd.aparapi.jni/dist/aparapi_x86_64.dll ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
+ -Dcom.amd.aparapi.useAgent=true ^
+ -Dcom.amd.aparapi.executionMode=%1 ^
+ -Dcom.amd.aparapi.logLevel=OFF^
+ -Dcom.amd.aparapi.enableVerboseJNI=false ^
+ -Dcom.amd.aparapi.enableProfiling=false ^
+ -Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
+ -Dcom.amd.aparapi.enableVerboseJNIOpenCLResourceTracking=false ^
+ -Dcom.amd.aparapi.dumpFlags=true ^
+ -Dcom.amd.aparapi.enableInstructionDecodeViewer=false ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;mandel.jar ^
+ com.amd.aparapi.sample.mandel.Main
+
+
--
GitLab