Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a752abe authored by Miao Wang's avatar Miao Wang Committed by Android (Google) Code Review
Browse files

Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev

parents e0b71b4e 6099ee6e

rs/java/android/renderscript/ScriptIntrinsicBLAS.java

+9 −3
Original line number Diff line number Diff line
@@ -3279,9 +3279,9 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
     * gives some headroom to avoid wrapping around on small overflows.

     *

     * @param A The input allocation contains matrix A, supported elements type {@link Element#U8}.

     * @param a_offset The offset for all values in matrix A, e.g A[i,j] = A[i,j] - a_offset.

     * @param a_offset The offset for all values in matrix A, e.g A[i,j] = A[i,j] - a_offset. Value should be from 0 to 255.

     * @param B The input allocation contains matrix B, supported elements type {@link Element#U8}.

     * @param b_offset The offset for all values in matrix B, e.g B[i,j] = B[i,j] - b_offset.

     * @param b_offset The offset for all values in matrix B, e.g B[i,j] = B[i,j] - b_offset. Value should be from 0 to 255.

     * @param C The input allocation contains matrix C, supported elements type {@link Element#U8}.

     * @param c_offset The offset for all values in matrix C.

     * @param c_mult The multiplier for all values in matrix C, e.g C[i,j] = (C[i,j] + c_offset) * c_mult.
@@ -3289,6 +3289,12 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
    public void BNNM(Allocation A, int a_offset, Allocation B, int b_offset, Allocation C, int c_offset, int c_mult) {

        validateL3(Element.U8(mRS), NO_TRANSPOSE, TRANSPOSE, 0, A, B, C);



        if (a_offset < 0 || a_offset > 255) {

            throw new RSRuntimeException("Invalid a_offset passed to BNNM");

        }

        if (b_offset < 0 || b_offset > 255) {

            throw new RSRuntimeException("Invalid b_offset passed to BNNM");

        }

        int M = -1, N = -1, K = -1;

        M = A.getType().getY();

        N = B.getType().getY();

rs/jni/android_renderscript_RenderScript.cpp

+2 −2
Original line number Diff line number Diff line
@@ -696,8 +696,8 @@ nScriptIntrinsicBLAS_BNNM(JNIEnv *_env, jobject _this, jlong con, jlong id, jint 
    call.M = M;

    call.N = N;

    call.K = K;

    call.a_offset = a_offset;

    call.b_offset = b_offset;

    call.a_offset = a_offset & 0xFF;

    call.b_offset = b_offset & 0xFF;

    call.c_offset = c_offset;

    call.c_mult_int = c_mult_int;