diff --git a/llvm/test/VISC/MatrixMultiplication/metadata.py b/llvm/test/VISC/MatrixMultiplication/metadata.py
deleted file mode 100755
index ffa52fa920046a39199c591ef6e5eea640d99a92..0000000000000000000000000000000000000000
--- a/llvm/test/VISC/MatrixMultiplication/metadata.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/python
-import re
-import shutil
-import sys
-
-if len(sys.argv) != 3:
-  print 'usage: ./metadata.py inputfile outputfile'
-  sys.exit()
-
-infilename = sys.argv[1]
-outfilename = sys.argv[2]
-
-with open(infilename, 'r') as f:
-  for line in f:
-    matchObj = re.match(r'!nvvm.annotations = !{(!\d+(,!\d+)*)}', line)
-    if matchObj:
-      kernelsMDstring = matchObj.group(1)
-      kernelsMD = kernelsMDstring.split(',')
-
-kernelIdx = 0
-
-with open(infilename, 'r') as fin:
-  with open(outfilename, 'w') as fout:
-    for line in fin:
-      if kernelsMD and line.startswith(kernelsMD[0]):
-        kernelIdx += 1
-        newline = re.sub(r'metadata !\d+, metadata !\d+', "metadata !\"kernel\", i32 " + str(kernelIdx), line)
-        kernelsMD = kernelsMD[1:]
-      else:
-        matchObj = re.search(r'metadata !{metadata !"kernel"}|metadata !{i32 \d+}', line)
-        if matchObj:
-          newline = ""
-        else:
-          newline = line
-      fout.write(newline)
-
diff --git a/llvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll b/llvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll
index e0fe3822e3368262e2776d3af77171d6b6a426fa..b7a5da184865ca469ec41a0c75ab82798f941585 100644
--- a/llvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll
+++ b/llvm/test/VISC/MatrixMultiplication/visc_gemm_ptx.ll
@@ -1,6 +1,4 @@
 ; RUN: opt -load LLVMBuildDFG.so -load LLVMDFG2LLVM_NVPTX.so -load LLVMDFG2LLVM_X86.so -load LLVMClearDFG.so -dfg2llvm-nvptx -dfg2llvm-x86 -clearDFG -o %t.ll -S %s
-; RUN: %S/metadata.py %s.kernels.ll %t.kernels.ll
-; RUN: mv %t.kernels.ll %s.kernels.ll
 ; RUN: llvm-link %llvm_src/../libclc/built_libs/nvptx--nvidiacl.bc %s.kernels.ll -o %t.ll.kernels.linked.bc
 ; RUN: clang -O3 -target nvptx %t.ll.kernels.linked.bc -S -o %s.nvptx.s
 ; RUN: llvm-link %t.ll %llvm_src/projects/visc-rt/visc-rt.ll -S -o %t.linked.ll