diff --git a/llvm/test/VISC/parboil/benchmarks/sgemm/Makefile b/llvm/test/VISC/parboil/benchmarks/sgemm/Makefile
index b81433c83df8645bb9166bead85dc9c259e5f524..66d40288b73088cc59aa98e72f2bfe4827f00e42 100644
--- a/llvm/test/VISC/parboil/benchmarks/sgemm/Makefile
+++ b/llvm/test/VISC/parboil/benchmarks/sgemm/Makefile
@@ -21,21 +21,12 @@ SRCDIR = src/$(VERSION)
 BUILDDIR = build/$(VERSION)_$(PLATFORM)
 DATASET_DIR = $(PARBOIL_ROOT)/datasets/$(APP)
 
-ifeq ($(TEST),small)
-  MATRIX1 = $(DATASET_DIR)/small/input/matrix1.txt
-  MATRIX2 = $(DATASET_DIR)/small/input/matrix2.txt
-  MATRIX2T = $(DATASET_DIR)/small/input/matrix2t.txt
-  REF_OUTPUT = $(DATASET_DIR)/small/output/matrix3.txt
-  RUNDIR = run/$(VERSION)/small
-  OUTPUT = $(RUNDIR)/matrix3.txt
-else
-  MATRIX1 = $(DATASET_DIR)/medium/input/matrix1.txt
-  MATRIX2 = $(DATASET_DIR)/medium/input/matrix2.txt
-  MATRIX2T = $(DATASET_DIR)/medium/input/matrix2t.txt
-  REF_OUTPUT = $(DATASET_DIR)/medium/output/matrix3.txt
-  RUNDIR = run/$(VERSION)/medium
-  OUTPUT = $(RUNDIR)/matrix3.txt
-endif
+MATRIX1 = $(DATASET_DIR)/$(TEST)/input/matrix1.txt
+MATRIX2 = $(DATASET_DIR)/$(TEST)/input/matrix2.txt
+MATRIX2T = $(DATASET_DIR)/$(TEST)/input/matrix2t.txt
+REF_OUTPUT = $(DATASET_DIR)/$(TEST)/output/matrix3.txt
+RUNDIR = run/$(VERSION)/$(TEST)
+OUTPUT = $(RUNDIR)/matrix3.txt
 
 ARGS = -i $(MATRIX1),$(MATRIX2),$(MATRIX2T) -o $(OUTPUT)
 TOOL = tools/compare-output
diff --git a/llvm/test/VISC/parboil/datasets/sgemm/4K/input/DESCRIPTION b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/DESCRIPTION
new file mode 100644
index 0000000000000000000000000000000000000000..a029051be1830971434f9f2d32363727e57cee09
--- /dev/null
+++ b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/DESCRIPTION
@@ -0,0 +1 @@
+Inputs: matrix1.txt matrix2t.txt matrix2t.txt
diff --git a/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix1.txt b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0d16f3458c090dfe6e122186f2d880bc3e590455
Binary files /dev/null and b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix1.txt differ
diff --git a/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix2.txt b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e0b10a9bdd4bef26dca0631fa4ca0329feb6dc5e
Binary files /dev/null and b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix2.txt differ
diff --git a/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix2t.txt b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix2t.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e0b10a9bdd4bef26dca0631fa4ca0329feb6dc5e
Binary files /dev/null and b/llvm/test/VISC/parboil/datasets/sgemm/4K/input/matrix2t.txt differ
diff --git a/llvm/test/VISC/parboil/datasets/sgemm/4K/output/matrix3.txt b/llvm/test/VISC/parboil/datasets/sgemm/4K/output/matrix3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f9be90d16a77f549294876359bbcdd851df86571
Binary files /dev/null and b/llvm/test/VISC/parboil/datasets/sgemm/4K/output/matrix3.txt differ