You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2017/01/22 10:41:02 UTC
incubator-systemml git commit: [SYSTEMML-1166] Performance tsmm right
(cache blocking over K for L2)
Repository: incubator-systemml
Updated Branches:
refs/heads/master a0b9a1a31 -> 998b0b1a5
[SYSTEMML-1166] Performance tsmm right (cache blocking over K for L2)
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/998b0b1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/998b0b1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/998b0b1a
Branch: refs/heads/master
Commit: 998b0b1a5f511f5306a849e092a9cef6d9de4e1e
Parents: a0b9a1a
Author: Matthias Boehm <mb...@gmail.com>
Authored: Sun Jan 22 00:14:46 2017 +0100
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Sun Jan 22 00:14:46 2017 +0100
----------------------------------------------------------------------
.../runtime/matrix/data/LibMatrixMult.java | 47 ++++++++++----------
1 file changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/998b0b1a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
index b6594d8..923e618 100644
--- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
@@ -426,8 +426,10 @@ public class LibMatrixMult
int blklen = (int)(Math.ceil((double)ret.rlen/(2*k)));
for( int i=0; i<2*k & i*blklen<ret.rlen; i++ )
tasks.add(new MatrixMultTransposeTask(m1, ret, leftTranspose, i*blklen, Math.min((i+1)*blklen, ret.rlen)));
- pool.invokeAll(tasks);
+ List<Future<Object>> rtasks = pool.invokeAll(tasks);
pool.shutdown();
+ for( Future<Object> rtask : rtasks )
+ rtask.get(); //error handling
}
catch(Exception ex) {
throw new DMLRuntimeException(ex);
@@ -1753,24 +1755,23 @@ public class LibMatrixMult
//1) Unrolled inner loop, for better ILP
//2) Blocked execution, for less cache trashing in parallel exec
- // (smaller block sizes would be slightly better, but consistent as is)
- //3) Single write in inner loop (transient intermediates)
- int blocksize = 64;
- for( int bi = rl; bi<ru; bi+=blocksize )
- for( int bj = bi; bj<m; bj+=blocksize )
- {
- final int bimin = Math.min(ru, bi+blocksize);
- final int bjmin = Math.min(m, bj+blocksize);
-
- for(int i = bi, ix1 = bi*n, ix3 = bi*m; i < bimin; i++, ix1+=n, ix3+=m)
- {
- final int bjmax = Math.max(i,bj);
- for(int j = bjmax, ix2 = bjmax*n; j <bjmin; j++, ix2+=n) //from i due to symmetry
- {
- c[ ix3+j ] = dotProduct(a, a, ix1, ix2, n);
+ // (we block such that lhs, rhs, and output roughly fit into L2, output in L1)
+ //3) Asymmetric block sizes and exploitation of result symmetry
+ int blocksizeK = 1024; //two memory pages for sufficiently long scans
+ int blocksizeIJ = L2_CACHESIZE / 8 / blocksizeK / 2 - 1; //15
+
+ //blocked execution over IKJ (lhs/rhs in L2, output in L1)
+ for( int bi = rl; bi<ru; bi+=blocksizeIJ )
+ for( int bk = 0, bimin = Math.min(ru, bi+blocksizeIJ); bk<n; bk+=blocksizeK )
+ for( int bj = bi, bklen = Math.min(blocksizeK, n-bk); bj<m; bj+=blocksizeIJ ) {
+ //core tsmm block operation (15x15 vectors of length 1K elements)
+ int bjmin = Math.min(m, bj+blocksizeIJ);
+ for(int i=bi, ix1=bi*n+bk, ix3=bi*m; i<bimin; i++, ix1+=n, ix3+=m) {
+ final int bjmax = Math.max(i,bj); //from i due to symmetry
+ for(int j=bjmax, ix2=bjmax*n+bk; j <bjmin; j++, ix2+=n)
+ c[ ix3+j ] += dotProduct(a, a, ix1, ix2, bklen);
}
}
- }
}
}
else
@@ -3653,11 +3654,11 @@ public class LibMatrixMult
private static class MatrixMultTransposeTask implements Callable<Object>
{
- private MatrixBlock _m1 = null;
- private MatrixBlock _ret = null;
- private boolean _left = true;
- private int _rl = -1;
- private int _ru = -1;
+ private final MatrixBlock _m1;
+ private final MatrixBlock _ret;
+ private final boolean _left;
+ private final int _rl;
+ private final int _ru;
protected MatrixMultTransposeTask( MatrixBlock m1, MatrixBlock ret, boolean left, int rl, int ru )
{
@@ -3675,7 +3676,7 @@ public class LibMatrixMult
matrixMultTransposeSelfSparse(_m1, _ret, _left, _rl, _ru);
else
matrixMultTransposeSelfDense(_m1, _ret, _left, _rl, _ru);
-
+
return null;
}
}