@@ -99,9 +99,17 @@ export async function checkCorrectnessMatmul(
   */
   var errorSummary = 0;
 
+  /*
   const matmulCPUOp = new compute.MatmulCPUOp(firstMatrix, secondMatrix, shape);
   matmulCPUOp.executeSync();
   const matmulReferenceData = matmulCPUOp.data();
+  */
+  const matmulGPUOp = new compute.MatmulBufferOp(
+  device, glslang, firstMatrix, secondMatrix, shape);
+
+  matmulGPUOp.executeSync();
+  const matmulReferenceData = await matmulGPUOp.data();
+
   {
     const op = new compute.MatmulBufferOp(
         device, glslang, firstMatrix, secondMatrix, shape);
 
@@ -161,16 +161,16 @@ export class MatmulTextureR32FOp extends TextureOp {
       }
     }
     float mm_readA(int row, int col) {
-      return imageLoad(A, ivec2(row, col)).r;
+      return imageLoad(A, ivec2(col, row)).r;
     }
   
     float mm_readB(int row, int col) {
-      return imageLoad(B, ivec2(row, col)).r;
+      return imageLoad(B, ivec2(col, row)).r;
     }
   
     void mm_write(int row, int col, float value) {
       // TODO: Figure out why need vec4 here.
-      imageStore(result, ivec2(row,col), vec4(value, 0.0, 0.0, 0.0));
+      imageStore(result, ivec2(col, row), vec4(value, 0.0, 0.0, 0.0));
     }
   
     void main() {
Original file line number	Diff line number	Diff line change
`@@ -161,16 +161,16 @@ export class MatmulTextureR32FOp extends TextureOp {`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`float mm_readA(int row, int col) {`
`164`		`- return imageLoad(A, ivec2(row, col)).r;`
	`164`	`+ return imageLoad(A, ivec2(col, row)).r;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`float mm_readB(int row, int col) {`
`168`		`- return imageLoad(B, ivec2(row, col)).r;`
	`168`	`+ return imageLoad(B, ivec2(col, row)).r;`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`void mm_write(int row, int col, float value) {`
`172`	`172`	`// TODO: Figure out why need vec4 here.`
`173`		`- imageStore(result, ivec2(row,col), vec4(value, 0.0, 0.0, 0.0));`
	`173`	`+ imageStore(result, ivec2(col, row), vec4(value, 0.0, 0.0, 0.0));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`void main() {`