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

Commit e1cf0950 authored by Miao Wang's avatar Miao Wang
Browse files

[RenderScript] fix edges cases about Transpose for SYMM & SYR2K 

Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f
parent cc711795

rs/java/android/renderscript/ScriptIntrinsicBLAS.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -1013,7 +1013,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
            }

            }

        } else {

        } else {

            if (A != null) {

            if (A != null) {

                if (TransA != NO_TRANSPOSE) {

                if (TransA == TRANSPOSE || TransA == CONJ_TRANSPOSE) {

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

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

                    aM = A.getType().getX();

                    aM = A.getType().getX();

                } else {

                } else {
@@ -1022,7 +1022,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
                }

                }

            }

            }

            if (B != null) {

            if (B != null) {

                if (TransB != NO_TRANSPOSE) {

                if (TransB == TRANSPOSE || TransB == CONJ_TRANSPOSE) {

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

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

                    bM = B.getType().getX();

                    bM = B.getType().getX();

                } else {

                } else {
@@ -1273,7 +1273,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateUplo(Uplo);

        validateSYR2K(Element.F32(mRS), Trans, A, B, C);

        validateSYR2K(Element.F32(mRS), Trans, A, B, C);

        int K = -1;

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

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

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

        } else {

        } else {

            K = A.getType().getX();

            K = A.getType().getX();
@@ -1284,7 +1284,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateUplo(Uplo);

        validateSYR2K(Element.F64(mRS), Trans, A, B, C);

        validateSYR2K(Element.F64(mRS), Trans, A, B, C);

        int K = -1;

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

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

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

        } else {

        } else {

            K = A.getType().getX();

            K = A.getType().getX();
@@ -1295,7 +1295,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateUplo(Uplo);

        validateSYR2K(Element.F32_2(mRS), Trans, A, B, C);

        validateSYR2K(Element.F32_2(mRS), Trans, A, B, C);

        int K = -1;

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

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

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

        } else {

        } else {

            K = A.getType().getX();

            K = A.getType().getX();
@@ -1306,7 +1306,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateUplo(Uplo);

        validateSYR2K(Element.F64_2(mRS), Trans, A, B, C);

        validateSYR2K(Element.F64_2(mRS), Trans, A, B, C);

        int K = -1;

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

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

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

        } else {

        } else {

            K = A.getType().getX();

            K = A.getType().getX();