Index: llvm/trunk/utils/update_test_checks.py
===================================================================
--- llvm/trunk/utils/update_test_checks.py
+++ llvm/trunk/utils/update_test_checks.py
@@ -62,6 +62,8 @@
                       help='The opt binary used to generate the test case')
   parser.add_argument(
       '--function', help='The function in the test file to update')
+  parser.add_argument('--update-only', action='store_true',
+                      help='Only update test if it was already autogened')
   parser.add_argument('tests', nargs='+')
   args = parser.parse_args()
 
@@ -86,6 +88,11 @@
     with open(test) as f:
       input_lines = [l.rstrip() for l in f]
 
+    if args.update_only:
+      if len(input_lines) == 0 or 'autogenerated' not in input_lines[0]:
+        print('Skipping test which isn\'t autogenerated: %s' % (test), file=sys.stderr)
+        continue;
+
     raw_lines = [m.group(1)
                  for m in [common.RUN_LINE_RE.match(l) for l in input_lines] if m]
     run_lines = [raw_lines[0]] if len(raw_lines) > 0 else []
@@ -102,6 +109,10 @@
 
     prefix_list = []
     for l in run_lines:
+      if '|' not in l:
+        print('WARNING: Skipping unparseable RUN line: %s' % (l,), file=sys.stderr)
+        continue
+        
       (tool_cmd, filecheck_cmd) = tuple([cmd.strip() for cmd in l.split('|', 1)])
       common.verify_filecheck_prefixes(filecheck_cmd)
       if not tool_cmd.startswith(opt_basename + ' '):