Craig Tiller пре 8 година
родитељ
комит
45d318351b
5 измењених фајлова са 101 додато и 291 уклоњено
  1. 74 104
      Makefile
  2. 0 30
      build.yaml
  3. 0 10
      src/core/lib/iomgr/exec_ctx.h
  4. 27 45
      tools/run_tests/generated/configs.json
  5. 0 102
      tools/run_tests/generated/tests.json

+ 74 - 104
Makefile

@@ -95,56 +95,6 @@ LDXX_opt = $(DEFAULT_CXX)
 CPPFLAGS_opt = -O2
 DEFINES_opt = NDEBUG
 
-VALID_CONFIG_asan-trace-cmp = 1
-REQUIRE_CUSTOM_LIBRARIES_asan-trace-cmp = 1
-CC_asan-trace-cmp = clang
-CXX_asan-trace-cmp = clang++
-LD_asan-trace-cmp = clang
-LDXX_asan-trace-cmp = clang++
-CPPFLAGS_asan-trace-cmp = -O0 -fsanitize-coverage=edge -fsanitize-coverage=trace-cmp -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_asan-trace-cmp = -fsanitize=address
-DEFINES_asan-trace-cmp += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
-
-VALID_CONFIG_dbg = 1
-CC_dbg = $(DEFAULT_CC)
-CXX_dbg = $(DEFAULT_CXX)
-LD_dbg = $(DEFAULT_CC)
-LDXX_dbg = $(DEFAULT_CXX)
-CPPFLAGS_dbg = -O0
-DEFINES_dbg = _DEBUG DEBUG
-
-VALID_CONFIG_easan = 1
-REQUIRE_CUSTOM_LIBRARIES_easan = 1
-CC_easan = clang
-CXX_easan = clang++
-LD_easan = clang
-LDXX_easan = clang++
-CPPFLAGS_easan = -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_easan = -fsanitize=address
-DEFINES_easan = _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
-DEFINES_easan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
-
-VALID_CONFIG_asan = 1
-REQUIRE_CUSTOM_LIBRARIES_asan = 1
-CC_asan = clang
-CXX_asan = clang++
-LD_asan = clang
-LDXX_asan = clang++
-CPPFLAGS_asan = -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_asan = -fsanitize=address
-DEFINES_asan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
-
-VALID_CONFIG_msan = 1
-REQUIRE_CUSTOM_LIBRARIES_msan = 1
-CC_msan = clang
-CXX_msan = clang++
-LD_msan = clang
-LDXX_msan = clang++
-CPPFLAGS_msan = -O0 -fsanitize-coverage=edge -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
-DEFINES_msan = NDEBUG
-DEFINES_msan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=4
-
 VALID_CONFIG_basicprof = 1
 CC_basicprof = $(DEFAULT_CC)
 CXX_basicprof = $(DEFAULT_CXX)
@@ -173,35 +123,23 @@ CPPFLAGS_asan-noleaks = -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omi
 LDFLAGS_asan-noleaks = -fsanitize=address
 DEFINES_asan-noleaks += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
 
-VALID_CONFIG_edbg = 1
-CC_edbg = $(DEFAULT_CC)
-CXX_edbg = $(DEFAULT_CXX)
-LD_edbg = $(DEFAULT_CC)
-LDXX_edbg = $(DEFAULT_CXX)
-CPPFLAGS_edbg = -O0
-DEFINES_edbg = _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
-
-VALID_CONFIG_ubsan = 1
-REQUIRE_CUSTOM_LIBRARIES_ubsan = 1
-CC_ubsan = clang
-CXX_ubsan = clang++
-LD_ubsan = clang
-LDXX_ubsan = clang++
-CPPFLAGS_ubsan = -O0 -fsanitize-coverage=edge -fsanitize=undefined,unsigned-integer-overflow -fno-omit-frame-pointer -Wno-unused-command-line-argument -Wvarargs
-LDFLAGS_ubsan = -fsanitize=undefined,unsigned-integer-overflow
-DEFINES_ubsan = NDEBUG
-DEFINES_ubsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=1.5
+VALID_CONFIG_asan-trace-cmp = 1
+REQUIRE_CUSTOM_LIBRARIES_asan-trace-cmp = 1
+CC_asan-trace-cmp = clang
+CXX_asan-trace-cmp = clang++
+LD_asan-trace-cmp = clang
+LDXX_asan-trace-cmp = clang++
+CPPFLAGS_asan-trace-cmp = -O0 -fsanitize-coverage=edge -fsanitize-coverage=trace-cmp -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
+LDFLAGS_asan-trace-cmp = -fsanitize=address
+DEFINES_asan-trace-cmp += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
 
-VALID_CONFIG_tsan = 1
-REQUIRE_CUSTOM_LIBRARIES_tsan = 1
-CC_tsan = clang
-CXX_tsan = clang++
-LD_tsan = clang
-LDXX_tsan = clang++
-CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_tsan = -fsanitize=thread
-DEFINES_tsan = GRPC_TSAN
-DEFINES_tsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5
+VALID_CONFIG_dbg = 1
+CC_dbg = $(DEFAULT_CC)
+CXX_dbg = $(DEFAULT_CXX)
+LD_dbg = $(DEFAULT_CC)
+LDXX_dbg = $(DEFAULT_CXX)
+CPPFLAGS_dbg = -O0
+DEFINES_dbg = _DEBUG DEBUG
 
 VALID_CONFIG_stapprof = 1
 CC_stapprof = $(DEFAULT_CC)
@@ -211,14 +149,14 @@ LDXX_stapprof = $(DEFAULT_CXX)
 CPPFLAGS_stapprof = -O2 -DGRPC_STAP_PROFILER
 DEFINES_stapprof = NDEBUG
 
-VALID_CONFIG_mutrace = 1
-CC_mutrace = $(DEFAULT_CC)
-CXX_mutrace = $(DEFAULT_CXX)
-LD_mutrace = $(DEFAULT_CC)
-LDXX_mutrace = $(DEFAULT_CXX)
-CPPFLAGS_mutrace = -O3 -fno-omit-frame-pointer
-LDFLAGS_mutrace = -rdynamic
-DEFINES_mutrace = NDEBUG
+VALID_CONFIG_gcov = 1
+CC_gcov = gcc
+CXX_gcov = g++
+LD_gcov = gcc
+LDXX_gcov = g++
+CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
+LDFLAGS_gcov = -fprofile-arcs -ftest-coverage -rdynamic
+DEFINES_gcov = _DEBUG DEBUG GPR_GCOV
 
 VALID_CONFIG_memcheck = 1
 CC_memcheck = $(DEFAULT_CC)
@@ -230,25 +168,57 @@ LDFLAGS_memcheck = -rdynamic
 DEFINES_memcheck = _DEBUG DEBUG
 DEFINES_memcheck += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=10
 
-VALID_CONFIG_etsan = 1
-REQUIRE_CUSTOM_LIBRARIES_etsan = 1
-CC_etsan = clang
-CXX_etsan = clang++
-LD_etsan = clang
-LDXX_etsan = clang++
-CPPFLAGS_etsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_etsan = -fsanitize=thread
-DEFINES_etsan = _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
-DEFINES_etsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5
+VALID_CONFIG_asan = 1
+REQUIRE_CUSTOM_LIBRARIES_asan = 1
+CC_asan = clang
+CXX_asan = clang++
+LD_asan = clang
+LDXX_asan = clang++
+CPPFLAGS_asan = -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
+LDFLAGS_asan = -fsanitize=address
+DEFINES_asan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=3
 
-VALID_CONFIG_gcov = 1
-CC_gcov = gcc
-CXX_gcov = g++
-LD_gcov = gcc
-LDXX_gcov = g++
-CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
-LDFLAGS_gcov = -fprofile-arcs -ftest-coverage -rdynamic
-DEFINES_gcov = _DEBUG DEBUG GPR_GCOV
+VALID_CONFIG_tsan = 1
+REQUIRE_CUSTOM_LIBRARIES_tsan = 1
+CC_tsan = clang
+CXX_tsan = clang++
+LD_tsan = clang
+LDXX_tsan = clang++
+CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
+LDFLAGS_tsan = -fsanitize=thread
+DEFINES_tsan = GRPC_TSAN
+DEFINES_tsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5
+
+VALID_CONFIG_ubsan = 1
+REQUIRE_CUSTOM_LIBRARIES_ubsan = 1
+CC_ubsan = clang
+CXX_ubsan = clang++
+LD_ubsan = clang
+LDXX_ubsan = clang++
+CPPFLAGS_ubsan = -O0 -fsanitize-coverage=edge -fsanitize=undefined,unsigned-integer-overflow -fno-omit-frame-pointer -Wno-unused-command-line-argument -Wvarargs
+LDFLAGS_ubsan = -fsanitize=undefined,unsigned-integer-overflow
+DEFINES_ubsan = NDEBUG
+DEFINES_ubsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=1.5
+
+VALID_CONFIG_msan = 1
+REQUIRE_CUSTOM_LIBRARIES_msan = 1
+CC_msan = clang
+CXX_msan = clang++
+LD_msan = clang
+LDXX_msan = clang++
+CPPFLAGS_msan = -O0 -fsanitize-coverage=edge -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
+LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
+DEFINES_msan = NDEBUG
+DEFINES_msan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=4
+
+VALID_CONFIG_mutrace = 1
+CC_mutrace = $(DEFAULT_CC)
+CXX_mutrace = $(DEFAULT_CXX)
+LD_mutrace = $(DEFAULT_CC)
+LDXX_mutrace = $(DEFAULT_CXX)
+CPPFLAGS_mutrace = -O3 -fno-omit-frame-pointer
+LDFLAGS_mutrace = -rdynamic
+DEFINES_mutrace = NDEBUG
 
 
 

+ 0 - 30
build.yaml

@@ -3698,36 +3698,6 @@ configs:
   dbg:
     CPPFLAGS: -O0
     DEFINES: _DEBUG DEBUG
-  easan:
-    CC: clang
-    CPPFLAGS: -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omit-frame-pointer
-      -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-    CXX: clang++
-    DEFINES: _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
-    LD: clang
-    LDFLAGS: -fsanitize=address
-    LDXX: clang++
-    compile_the_world: true
-    test_environ:
-      ASAN_OPTIONS: detect_leaks=1:color=always
-      LSAN_OPTIONS: suppressions=tools/lsan_suppressions.txt:report_objects=1
-    timeout_multiplier: 3
-  edbg:
-    CPPFLAGS: -O0
-    DEFINES: _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
-  etsan:
-    CC: clang
-    CPPFLAGS: -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument
-      -DGPR_NO_DIRECT_SYSCALLS
-    CXX: clang++
-    DEFINES: _DEBUG DEBUG GRPC_EXECUTION_CONTEXT_SANITIZER
-    LD: clang
-    LDFLAGS: -fsanitize=thread
-    LDXX: clang++
-    compile_the_world: true
-    test_environ:
-      TSAN_OPTIONS: suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
-    timeout_multiplier: 5
   gcov:
     CC: gcc
     CPPFLAGS: -O0 -fprofile-arcs -ftest-coverage -Wno-return-type

+ 0 - 10
src/core/lib/iomgr/exec_ctx.h

@@ -63,7 +63,6 @@ typedef struct grpc_combiner grpc_combiner;
  *  - Instances are always passed as the first argument to a function that
  *    takes it, and always as a pointer (grpc_exec_ctx is never copied).
  */
-#ifndef GRPC_EXECUTION_CONTEXT_SANITIZER
 struct grpc_exec_ctx {
   grpc_closure_list closure_list;
   /** currently active combiner: updated only via combiner.c */
@@ -79,15 +78,6 @@ struct grpc_exec_ctx {
    prefer to use GRPC_EXEC_CTX_INIT whenever possible */
 #define GRPC_EXEC_CTX_INIT_WITH_FINISH_CHECK(finish_check, finish_check_arg) \
   { GRPC_CLOSURE_LIST_INIT, NULL, NULL, false, finish_check_arg, finish_check }
-#else
-struct grpc_exec_ctx {
-  bool cached_ready_to_finish;
-  void *check_ready_to_finish_arg;
-  bool (*check_ready_to_finish)(grpc_exec_ctx *exec_ctx, void *arg);
-};
-#define GRPC_EXEC_CTX_INIT_WITH_FINISH_CHECK(finish_check, finish_check_arg) \
-  { false, finish_check_arg, finish_check }
-#endif
 
 /* initialize an execution context at the top level of an API call into grpc
    (this is safe to use elsewhere, though possibly not as efficient) */

+ 27 - 45
tools/run_tests/generated/configs.json

@@ -2,37 +2,6 @@
   {
     "config": "opt"
   }, 
-  {
-    "config": "asan-trace-cmp", 
-    "environ": {
-      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
-    }, 
-    "timeout_multiplier": 3
-  }, 
-  {
-    "config": "dbg"
-  }, 
-  {
-    "config": "easan", 
-    "environ": {
-      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
-    }, 
-    "timeout_multiplier": 3
-  }, 
-  {
-    "config": "asan", 
-    "environ": {
-      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
-    }, 
-    "timeout_multiplier": 3
-  }, 
-  {
-    "config": "msan", 
-    "timeout_multiplier": 4
-  }, 
   {
     "config": "basicprof"
   }, 
@@ -52,27 +21,21 @@
     "timeout_multiplier": 3
   }, 
   {
-    "config": "edbg"
-  }, 
-  {
-    "config": "ubsan", 
+    "config": "asan-trace-cmp", 
     "environ": {
-      "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1"
+      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
+      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
     }, 
-    "timeout_multiplier": 1.5
+    "timeout_multiplier": 3
   }, 
   {
-    "config": "tsan", 
-    "environ": {
-      "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
-    }, 
-    "timeout_multiplier": 5
+    "config": "dbg"
   }, 
   {
     "config": "stapprof"
   }, 
   {
-    "config": "mutrace"
+    "config": "gcov"
   }, 
   {
     "config": "memcheck", 
@@ -84,13 +47,32 @@
     ]
   }, 
   {
-    "config": "etsan", 
+    "config": "asan", 
+    "environ": {
+      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
+      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
+    }, 
+    "timeout_multiplier": 3
+  }, 
+  {
+    "config": "tsan", 
     "environ": {
       "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
     }, 
     "timeout_multiplier": 5
   }, 
   {
-    "config": "gcov"
+    "config": "ubsan", 
+    "environ": {
+      "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1"
+    }, 
+    "timeout_multiplier": 1.5
+  }, 
+  {
+    "config": "msan", 
+    "timeout_multiplier": 4
+  }, 
+  {
+    "config": "mutrace"
   }
 ]

+ 0 - 102
tools/run_tests/generated/tests.json

@@ -37585,9 +37585,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37622,9 +37619,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37659,9 +37653,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37696,9 +37687,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37733,9 +37721,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37770,9 +37755,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37807,9 +37789,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37844,9 +37823,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37881,9 +37857,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37918,9 +37891,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37955,9 +37925,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -37992,9 +37959,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38029,9 +37993,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38066,9 +38027,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38103,9 +38061,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38140,9 +38095,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38177,9 +38129,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38214,9 +38163,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38251,9 +38197,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38288,9 +38231,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38325,9 +38265,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38362,9 +38299,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38399,9 +38333,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38436,9 +38367,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38473,9 +38401,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38510,9 +38435,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38547,9 +38469,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38584,9 +38503,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38621,9 +38537,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38658,9 +38571,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38695,9 +38605,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38732,9 +38639,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38769,9 +38673,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck", 
@@ -38806,9 +38707,6 @@
       "asan-trace-cmp", 
       "basicprof", 
       "dbg", 
-      "easan", 
-      "edbg", 
-      "etsan", 
       "gcov", 
       "helgrind", 
       "memcheck",