by8 count

Author: Baunsgaard

src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToChar.java

@@ -230,11 +230,27 @@ public void copyInt(int[] d, int start, int end) {
 
 	@Override
 	public int[] getCounts(int[] ret) {
-		for(int i = 0; i < _data.length; i++)
+		final int h = (_data.length) % 8;
+		for(int i = 0; i < h; i++)
 			ret[_data[i]]++;
+		getCountsBy8P(ret, h, _data.length);
 		return ret;
 	}
 
+	private void getCountsBy8P(int[] ret, int s, int e) {
+		for(int i = s; i < e; i += 8) {
+			ret[_data[i]]++;
+			ret[_data[i + 1]]++;
+			ret[_data[i + 2]]++;
+			ret[_data[i + 3]]++;
+			ret[_data[i + 4]]++;
+			ret[_data[i + 5]]++;
+			ret[_data[i + 6]]++;
+			ret[_data[i + 7]]++;
+		}
+	}
+
+
 	@Override
 	public AMapToData resize(int unique) {
 		final int size = _data.length;

src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToCharPByte.java

@@ -37,7 +37,7 @@ public class MapToCharPByte extends AMapToData {
 
 	private static final long serialVersionUID = 6315708056775476541L;
 
-	public static final int max = (0xFFFF + 1) * 128 -1;
+	public static final int max = (0xFFFF + 1) * 128 - 1;
 	private final char[] _data_c;
 	private final byte[] _data_b; // next byte after the char
 
@@ -100,7 +100,7 @@ public void set(int n, int v) {
 	}
 
 	@Override
-	public void set(int l, int u, int off, AMapToData tm){
+	public void set(int l, int u, int off, AMapToData tm) {
 		for(int i = l; i < u; i++, off++) {
 			set(i, tm.getIndex(off));
 		}
@@ -169,14 +169,28 @@ public void copyInt(int[] d, int start, int end) {
 			set(i, d[i]);
 	}
 
-
 	@Override
 	public int[] getCounts(int[] ret) {
-		for(int i = 0; i < size(); i++)
-			ret[getIndex(i)]++;
+		final int h = (size()) % 8;
+		for(int i = 0; i < h; i++)
+			ret[_data_c[i] + ((int) _data_b[i] << 16)]++;
+		getCountsBy8P(ret, h, size());
 		return ret;
 	}
 
+	private void getCountsBy8P(int[] ret, int s, int e) {
+		for(int i = s; i < e; i += 8) {
+			ret[getIndex(i)]++;
+			ret[getIndex(i + 1)]++;
+			ret[getIndex(i + 2)]++;
+			ret[getIndex(i + 3)]++;
+			ret[getIndex(i + 4)]++;
+			ret[getIndex(i + 5)]++;
+			ret[getIndex(i + 6)]++;
+			ret[getIndex(i + 7)]++;
+		}
+	}
+
 	@Override
 	public AMapToData resize(int unique) {
 		final int size = _data_c.length;
@@ -263,7 +277,6 @@ public AMapToData appendN(IMapToDataGroup[] d) {
 
 	}
 
-
 	@Override
 	public boolean equals(AMapToData e) {
 		return e instanceof MapToCharPByte && //
@@ -326,7 +339,6 @@ protected void decompressToRangeNoOffBy8(double[] c, int r, double[] values) {
 		c[r + 7] += values[getIndex(r + 7)];
 	}
 
-
 	@Override
 	public void decompressToRange(double[] c, int rl, int ru, int offR, double[] values) {
 		// OVERWRITTEN FOR JIT COMPILE!

src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToInt.java

@@ -195,11 +195,27 @@ public void copyInt(int[] d, int start, int end) {
 
 	@Override
 	public int[] getCounts(int[] ret) {
-		for(int i = 0; i < _data.length; i++)
+		final int h = (_data.length) % 8;
+		for(int i = 0; i < h; i++)
 			ret[_data[i]]++;
+		getCountsBy8P(ret, h, _data.length);
 		return ret;
 	}
 
+	private void getCountsBy8P(int[] ret, int s, int e) {
+		for(int i = s; i < e; i += 8) {
+			ret[_data[i]]++;
+			ret[_data[i + 1]]++;
+			ret[_data[i + 2]]++;
+			ret[_data[i + 3]]++;
+			ret[_data[i + 4]]++;
+			ret[_data[i + 5]]++;
+			ret[_data[i + 6]]++;
+			ret[_data[i + 7]]++;
+		}
+	}
+
+
 	@Override
 	public int countRuns() {
 		int c = 1;

src/main/java/org/apache/sysds/runtime/compress/colgroup/mapping/MapToZero.java

@@ -110,8 +110,7 @@ public int getUpperBoundValue() {
 
 	@Override
 	public int[] getCounts(int[] ret) {
-		final int sz = size();
-		ret[0] = sz;
+		ret[0] = size();
 		return ret;
 	}