269 Commits

Author SHA1 Message Date
Jason Sams
d1516dffa8 Fix Allocation-less launches
Cherry-pick fix from AOSP.  Error check for kernel launch was
generating a false positive.

bug 20690242


Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
2015-05-05 18:00:34 -07:00
Yang Ni
17c2d7a3e1 Sanity checks in JNI code for closure creation
b/20728113

In case the requested size for memory allocation overflows, or memory
allocation fails.

Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
(cherry picked from commit 4e90b9b57cc96964a9d5c1845172a72cb51feafb)
2015-05-04 15:09:29 -07:00
Miao Wang
194679ed95 [RenderScript] typo fix in BLAS, TRMM & TSMM
Change-Id: I78f014a864700369c7ccdfb46a257851a45abd7c
2015-04-30 17:14:28 -07:00
Miao Wang
8724d359bf Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev 2015-04-30 21:25:25 +00:00
Miao Wang
01060a33a4 Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev 2015-04-30 21:25:03 +00:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
Miao Wang
82585b3906 [RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.

Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
2015-04-30 13:44:49 -07:00
Miao Wang
1e940d87c4 [RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f
2015-04-30 13:37:38 -07:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-30 12:46:57 -07:00
Miao Wang
9e4dbf0557 Merge changes I99f9f9ff,I559b5c56 into mnc-dev
* changes:
  [RenderScript] L2 BLAS, fix element type in ZHER
  [RenderScript] fixes for L3 BLAS APIs
2015-04-30 02:20:44 +00:00
Miao Wang
cecc00aba1 [RenderScript] L2 BLAS, fix element type in ZHER
Change-Id: I99f9f9ff8942522d6581ff60b9a2d75e33e66ff6
2015-04-29 18:15:36 -07:00
Miao Wang
508a2870e9 Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev 2015-04-30 00:07:30 +00:00
Miao Wang
a57a8a8cc9 Merge "[RenderScript] improve & minor fixes of L2 BLAS validation." into mnc-dev 2015-04-30 00:06:37 +00:00
Miao Wang
634160a056 Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'" into mnc-dev 2015-04-30 00:04:12 +00:00
Miao Wang
37ae07c643 [RenderScript] fixes for L3 BLAS APIs
- Typo for validateUplo
  - Typo in ZHEMM, element should be FLOAT64_2.
  - For GEMM and SYMM, SYRK, 'CONJ_TRANSPOSE' should also be handled in the
    validation process.
  - For SYMM, check matrix A is symmetric.
  - For HERK, the dimension validation was switched for Transpose case.
    Also, only Conj Trans is allowed in this case.
  - FOR SYR2K, fix the dimension check for Matrix C.
  - For TRMM & TRSM, fix the validation part for dimension check.

Change-Id: I559b5c5695aa82604de2955ae2327b694236d3ed
2015-04-29 17:00:28 -07:00
Miao Wang
89c3a5f8c5 [RenderScript] Enable L2 BLAS APIs
Change-Id: I484a185a79190da365ac832b90bb3bedb8bbca48
2015-04-23 15:20:11 -07:00
Miao Wang
68ca43ebe6 [RenderScript] improve & minor fixes of L2 BLAS validation.
Change-Id: If8dd0f9d4c7db03df22763a80fa6d600539be7c1
2015-04-23 15:06:09 -07:00
Miao Wang
4c47274522 [RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle
complex 'Alpha' and 'Beta'

Change-Id: I0aed57d41b0199d5c6dd3c31ca33644a5634dc35
2015-04-22 15:57:57 -07:00
John Reck
f7de58130a Merge "GraphicsJNI Canvas cleanup" 2015-04-22 20:00:46 +00:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
2015-04-22 09:34:34 -07:00
Yang Ni
db720ce9f2 Merge "Move new script group API into ScriptGroup class" 2015-04-22 16:00:09 +00:00
Yang Ni
18314caccd Move new script group API into ScriptGroup class
And mark existing methods and builder deprecated.
Removed ScriptGroup2 class.
Renamed nested class UnboundValue to Input.
Marked classes Closure, Future, and Input as final.

Change-Id: I362910c115e9d0173dc515674e08bf4878232879
2015-04-21 14:13:47 -07:00
John Reck
8222a7ec81 Merge "Revert "Change how Java Bitmaps are accessed in a few places"" 2015-04-20 22:07:45 +00:00
John Reck
edc22fba59 Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
2015-04-20 22:06:31 +00:00
John Reck
9d4efdf280 Revert "A bunch more cleanups"
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
2015-04-17 20:47:27 +00:00
Tim Murray
ef0e1c6a0c Unhide BLAS intrinsics.
Change-Id: I3006d878e68cce833d8f26cb5d8a1a660a6f5565
2015-04-16 11:15:43 -07:00
Miao Wang
68e03ab998 am 13391109: am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '133911095ce0d9ef01766aa7b67a0a31b852e242':
  [RenderScript] typo fix in Allocation.java
2015-04-16 02:46:43 +00:00
Miao Wang
782b43394e Merge "[RenderScript] typo fix in Allocation.java" 2015-04-16 02:03:32 +00:00
Miao Wang
179e8b5351 [RenderScript] typo fix in Allocation.java
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
2015-04-15 17:44:32 -07:00
Jason Sams
a217d69d05 Merge "Hide array allocation" 2015-04-16 00:35:23 +00:00
Jason Sams
d016266de2 Hide array allocation
Not done for feature complete

Change-Id: I79c8da2c7e64d6feb660c9652688f971535c1f92
2015-04-15 17:18:10 -07:00
Tim Murray
ef532f8435 am 3d9c9093: am 91d2f27b: am 7f72f747: Merge "Add BNNM intrinsic."
* commit '3d9c9093d1d76d4aeb5f99b1746b65788c72736e':
  Add BNNM intrinsic.
2015-04-15 23:15:13 +00:00
Tim Murray
7f72f74766 Merge "Add BNNM intrinsic." 2015-04-15 22:30:14 +00:00
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
John Reck
c294d128d0 A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
2015-04-14 15:38:22 -07:00
Tim Murray
9cb16a2f91 Add BNNM intrinsic.
Change-Id: I05fc9835786455e28d69f2b4ffe70c3292a01404
2015-04-14 15:10:19 -07:00
Yang Ni
5024f20a85 am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method"
* commit '0933905375790eb850334b53fd6d0981bd40e007':
  Add name to ScriptGroup2.Builder.create() method
2015-04-14 17:02:33 +00:00
Yang Ni
35be56cce8 Add name to ScriptGroup2.Builder.create() method
This name will be used to name the .so file generated for the
script group with fused kernels.

Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
2015-04-13 17:24:44 -07:00
Yang Ni
ad6b44aaa1 Add a name to ScriptGroup2.Builder.create method
The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.

A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.

Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
2015-04-13 14:32:18 -07:00
John Reck
073f36c6c1 Merge "Change how Java Bitmaps are accessed in a few places" 2015-04-13 19:20:59 +00:00
John Reck
a771b9861d Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-13 09:50:42 -07:00
Tim Murray
9509bfe46a am 72fcf9eb: am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory."
* commit '72fcf9eb1079312afd7bdbee167c759109af4244':
  Add support for setting the cache directory.
2015-04-10 04:35:04 +00:00
Tim Murray
47f31582b6 Add support for setting the cache directory.
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
2015-04-09 17:50:39 -07:00
Stephen Hines
b6b17a575f resolved conflicts for merge of 764f08ad to master
Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3
2015-04-07 14:47:32 -07:00
Tim Murray
e1e6c66198 Move cache dir to its own class.
This prevents us from loading the RS static initializer all the time.

Change-Id: I8cea7540e50251aba8c2f199f06f344f991e7d7f
2015-04-07 13:24:14 -07:00
Yang Ni
922346c0b2 Merge "Add a name to ScriptGroup2.Builder.create method" 2015-04-07 19:54:31 +00:00
Yang Ni
1709856238 Add a name to ScriptGroup2.Builder.create method
The name is not used in any meaningful way yet, but would be used
to name the file for generated code for fused kernels in other
coming CLs.

A script group name cannot be null or empty, or longer than 100
characters. It can only contain letters, digits, '-', or '_'.

Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
2015-04-07 09:37:50 -07:00
Jason Sams
217a36b193 am ef2279a1: am 283e5ce3: am 7200f661: Merge "Fix minor blur doc bug"
* commit 'ef2279a1f1a12b9ba16cd18c7ec2be97111307a8':
  Fix minor blur doc bug
2015-04-07 00:17:24 +00:00
Yang Ni
a9d76d153d am 249968b4: am 6bef5eb4: am 6422ee71: Merge "Rewrote FieldPack::createFieldPack for alignment"
* commit '249968b421a8dcfe5a26ec7f524e76295ec5eef5':
  Rewrote FieldPack::createFieldPack for alignment
2015-04-07 00:06:34 +00:00
Jason Sams
7200f661c1 Merge "Fix minor blur doc bug" 2015-04-06 23:38:05 +00:00