am bbfa9b23: Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev (663ba954) · Commits · e / os / android_frameworks_base

rs/java/android/renderscript/ScriptIntrinsicBLAS.java

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1288,7 +1288,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic {
	} else {		} else {
	K = A.getType().getX();		K = A.getType().getX();
	}		}
	mRS.nScriptIntrinsicBLAS_Double(getID(mRS), RsBlas_ssyr2k, Trans, 0, 0, Uplo, 0, 0, C.getType().getX(), K, alpha, A.getID(mRS), B.getID(mRS), beta, C.getID(mRS), 0, 0, 0, 0);		mRS.nScriptIntrinsicBLAS_Double(getID(mRS), RsBlas_dsyr2k, Trans, 0, 0, Uplo, 0, 0, C.getType().getX(), K, alpha, A.getID(mRS), B.getID(mRS), beta, C.getID(mRS), 0, 0, 0, 0);
	}		}
	public void CSYR2K(@Uplo int Uplo, @Transpose int Trans, Float2 alpha, Allocation A, Allocation B, Float2 beta, Allocation C) {		public void CSYR2K(@Uplo int Uplo, @Transpose int Trans, Float2 alpha, Allocation A, Allocation B, Float2 beta, Allocation C) {
	validateUplo(Uplo);		validateUplo(Uplo);
	@@ -1299,7 +1299,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic {
	} else {		} else {
	K = A.getType().getX();		K = A.getType().getX();
	}		}
	mRS.nScriptIntrinsicBLAS_Complex(getID(mRS), RsBlas_ssyr2k, Trans, 0, 0, Uplo, 0, 0, C.getType().getX(), K, alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), beta.x, beta.y, C.getID(mRS), 0, 0, 0, 0);		mRS.nScriptIntrinsicBLAS_Complex(getID(mRS), RsBlas_csyr2k, Trans, 0, 0, Uplo, 0, 0, C.getType().getX(), K, alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), beta.x, beta.y, C.getID(mRS), 0, 0, 0, 0);
	}		}
	public void ZSYR2K(@Uplo int Uplo, @Transpose int Trans, Double2 alpha, Allocation A, Allocation B, Double2 beta, Allocation C) {		public void ZSYR2K(@Uplo int Uplo, @Transpose int Trans, Double2 alpha, Allocation A, Allocation B, Double2 beta, Allocation C) {
	validateUplo(Uplo);		validateUplo(Uplo);
	@@ -1310,7 +1310,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic {
	} else {		} else {
	K = A.getType().getX();		K = A.getType().getX();
	}		}
	mRS.nScriptIntrinsicBLAS_Z(getID(mRS), RsBlas_ssyr2k, Trans, 0, 0, Uplo, 0, 0, C.getType().getX(), K, alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), beta.x, beta.y, C.getID(mRS), 0, 0, 0, 0);		mRS.nScriptIntrinsicBLAS_Z(getID(mRS), RsBlas_zsyr2k, Trans, 0, 0, Uplo, 0, 0, C.getType().getX(), K, alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), beta.x, beta.y, C.getID(mRS), 0, 0, 0, 0);
	}		}

	static void validateTRMM(Element e, @Side int Side, @Transpose int TransA, Allocation A, Allocation B) {		static void validateTRMM(Element e, @Side int Side, @Transpose int TransA, Allocation A, Allocation B) {
	@@ -1351,21 +1351,21 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic {
	validateUplo(Uplo);		validateUplo(Uplo);
	validateDiag(Diag);		validateDiag(Diag);
	validateTRMM(Element.F64(mRS), Side, TransA, A, B);		validateTRMM(Element.F64(mRS), Side, TransA, A, B);
	mRS.nScriptIntrinsicBLAS_Double(getID(mRS), RsBlas_strmm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,		mRS.nScriptIntrinsicBLAS_Double(getID(mRS), RsBlas_dtrmm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,
	alpha, A.getID(mRS), B.getID(mRS), 0.f, 0, 0, 0, 0, 0);		alpha, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0);
	}		}
	public void CTRMM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Float2 alpha, Allocation A, Allocation B) {		public void CTRMM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Float2 alpha, Allocation A, Allocation B) {
	validateUplo(Uplo);		validateUplo(Uplo);
	validateDiag(Diag);		validateDiag(Diag);
	validateTRMM(Element.F32_2(mRS), Side, TransA, A, B);		validateTRMM(Element.F32_2(mRS), Side, TransA, A, B);
	mRS.nScriptIntrinsicBLAS_Complex(getID(mRS), RsBlas_strmm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,		mRS.nScriptIntrinsicBLAS_Complex(getID(mRS), RsBlas_ctrmm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,
	alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);		alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);
	}		}
	public void ZTRMM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Double2 alpha, Allocation A, Allocation B) {		public void ZTRMM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Double2 alpha, Allocation A, Allocation B) {
	validateUplo(Uplo);		validateUplo(Uplo);
	validateDiag(Diag);		validateDiag(Diag);
	validateTRMM(Element.F64_2(mRS), Side, TransA, A, B);		validateTRMM(Element.F64_2(mRS), Side, TransA, A, B);
	mRS.nScriptIntrinsicBLAS_Z(getID(mRS), RsBlas_strmm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,		mRS.nScriptIntrinsicBLAS_Z(getID(mRS), RsBlas_ztrmm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,
	alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);		alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);
	}		}

	@@ -1409,21 +1409,21 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic {
	validateUplo(Uplo);		validateUplo(Uplo);
	validateDiag(Diag);		validateDiag(Diag);
	validateTRSM(Element.F64(mRS), Side, TransA, A, B);		validateTRSM(Element.F64(mRS), Side, TransA, A, B);
	mRS.nScriptIntrinsicBLAS_Double(getID(mRS), RsBlas_strsm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,		mRS.nScriptIntrinsicBLAS_Double(getID(mRS), RsBlas_dtrsm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,
	alpha, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0);		alpha, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0);
	}		}
	public void CTRSM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Float2 alpha, Allocation A, Allocation B) {		public void CTRSM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Float2 alpha, Allocation A, Allocation B) {
	validateUplo(Uplo);		validateUplo(Uplo);
	validateDiag(Diag);		validateDiag(Diag);
	validateTRSM(Element.F32_2(mRS), Side, TransA, A, B);		validateTRSM(Element.F32_2(mRS), Side, TransA, A, B);
	mRS.nScriptIntrinsicBLAS_Complex(getID(mRS), RsBlas_strsm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,		mRS.nScriptIntrinsicBLAS_Complex(getID(mRS), RsBlas_ctrsm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,
	alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);		alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);
	}		}
	public void ZTRSM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Double2 alpha, Allocation A, Allocation B) {		public void ZTRSM(@Side int Side, @Uplo int Uplo, @Transpose int TransA, @Diag int Diag, Double2 alpha, Allocation A, Allocation B) {
	validateUplo(Uplo);		validateUplo(Uplo);
	validateDiag(Diag);		validateDiag(Diag);
	validateTRSM(Element.F64_2(mRS), Side, TransA, A, B);		validateTRSM(Element.F64_2(mRS), Side, TransA, A, B);
	mRS.nScriptIntrinsicBLAS_Z(getID(mRS), RsBlas_strsm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,		mRS.nScriptIntrinsicBLAS_Z(getID(mRS), RsBlas_ztrsm, TransA, 0, Side, Uplo, Diag, B.getType().getY(), B.getType().getX(), 0,
	alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);		alpha.x, alpha.y, A.getID(mRS), B.getID(mRS), 0, 0, 0, 0, 0, 0, 0);
	}		}