Remove vestiges of the C Backend from the test-suite.

Signed off by Eric Christopher.

llvm-svn: 154856

External/skidmarks10/Makefile

@@ -4,7 +4,6 @@ include $(LEVEL)/Makefile.config
 PROG = skidmarks
 
 DISABLE_JIT = 1
-DISABLE_CBE = 1
 
 SourceDir := $(SKIDMARKS10_ROOT)/source
 RUN_OPTIONS = 0 $(SKIDMARKS10_ROOT)/golden

LLVMSource/Makefile

@@ -17,8 +17,6 @@ $(LLVM_SOURCE_BYTECODES): \
 Output/%.llvm.bc: %.ll $(LLVMAS) Output/.dir
 	$(LLVMAS) $< -f -o $@
 
-all:: $(CBEOUTPUT)
-
 ifdef TARGET_HAS_JIT
 all:: $(JITOUTPUT)
 endif

Makefile.programs

@@ -160,7 +160,6 @@ BYTECODE   := $(addsuffix .llvm.bc, $(PREFIXED_PROGRAMS_TO_TEST))
 
 LLCCODEGEN := $(addsuffix .llc.s,   $(PREFIXED_PROGRAMS_TO_TEST))
 LLCBETACODEGEN := $(addsuffix .llc-beta.s,   $(PREFIXED_PROGRAMS_TO_TEST))
-CBECODEGEN := $(addsuffix .cbe,     $(PREFIXED_PROGRAMS_TO_TEST))
 
 # Output produced by programs run
 GCCOUTPUT := $(addsuffix .ll,       $(addprefix Output/,$basename $(Source)))
@@ -170,7 +169,6 @@ JITOUTPUT := $(addsuffix .out-jit,  $(PREFIXED_PROGRAMS_TO_TEST))
 JITBETAOUTPUT := $(addsuffix .out-jit-beta,  $(PREFIXED_PROGRAMS_TO_TEST))
 LLCOUTPUT := $(addsuffix .out-llc,  $(PREFIXED_PROGRAMS_TO_TEST))
 LLCBETAOUTPUT := $(addsuffix .out-llc-beta,  $(PREFIXED_PROGRAMS_TO_TEST))
-CBEOUTPUT := $(addsuffix .out-cbe,  $(PREFIXED_PROGRAMS_TO_TEST))
 
 # Diffs of program runs vs the native program
 LLIDIFFS  := $(addsuffix .diff-lli, $(PREFIXED_PROGRAMS_TO_TEST))
@@ -179,7 +177,6 @@ JITBETADIFFS  := $(addsuffix .diff-jit-beta, $(PREFIXED_PROGRAMS_TO_TEST))
 LLCDIFFS  := $(addsuffix .diff-llc, $(PREFIXED_PROGRAMS_TO_TEST))
 LLCBETADIFFS  := $(addsuffix .diff-llc-beta, $(PREFIXED_PROGRAMS_TO_TEST))
 OPTBETADIFFS  := $(addsuffix .diff-opt-beta, $(PREFIXED_PROGRAMS_TO_TEST))
-CBEDIFFS  := $(addsuffix .diff-cbe, $(PREFIXED_PROGRAMS_TO_TEST))
 
 # Profiles for the program.
 PROFOUTPUT := $(addsuffix .prof, $(PREFIXED_PROGRAMS_TO_TEST))
@@ -215,12 +212,6 @@ ifdef DISABLE_LLC
 DISABLE_LLC_DIFFS = 1
 endif
 
-ifndef DISABLE_CBE
-all:: $(CBECODEGEN)
-else
-DISABLE_CBE_DIFFS = 1
-endif
-
 ifndef DISABLE_DIFFS
 ifndef DISABLE_LLC_DIFFS
 all:: $(LLCDIFFS)
@@ -229,10 +220,6 @@ all:: $(LLCBETADIFFS)
 endif
 endif#DISABLE_LLC_DIFFS
 
-ifndef DISABLE_CBE_DIFFS
-all:: $(CBEDIFFS)
-endif
-
 ifdef TARGET_HAS_JIT
 ifndef DISABLE_JIT
 all:: $(JITDIFFS)

MultiSource/Applications/viterbi/dec_viterbi_F.c

@@ -14,7 +14,7 @@ void dec_viterbi_F(dvector* Metr_mem, unsigned char* history_mem, bitvector* bit
 #if 0
   /* FIXME */
   /* Time varies between runs giving false negatives about which run
-     (JIT, CBE, or LLC) failed */
+     (JIT or LLC) failed */
   double startTime, now, estTotal;
 #endif /* 0 */
 
@@ -38,15 +38,15 @@ void dec_viterbi_F(dvector* Metr_mem, unsigned char* history_mem, bitvector* bit
 #if 0
   /* FIXME */
   /* Time varies between runs giving false negatives about which run
-     (JIT, CBE, or LLC) failed */
+     (JIT or LLC) failed */
   startTime = sTime();
 #endif /* 0 */
   i_punct = 0;
   while (i_in<bit_stream->length) {
 #if 0
     /* FIXME */
     /* Time varies between runs giving false negatives about which run
-       (JIT, CBE, or LLC) failed */
+       (JIT or LLC) failed */
     if (i_in && (i_in % 10000 == 0)) {
       now = sTime();
       estTotal = ((double)1.02*bit_stream->length/((double)i_in))*(now-startTime);

SingleSource/UnitTests/2005-05-11-Popcount-ffs-fls.c

@@ -73,7 +73,7 @@ int main(void) {
 
   /* note: we don't test zero, because the _native_ test will get it
    * wrong (GCC returns garbage for ctz/clz of 0), and the nightly tester
-   * will wrongly conclude that CBE and LLC are both failing.
+   * will wrongly conclude that LLC is failing.
    */
   for(i=10; i<139045193; i*=-3) {
     printf("LLVM: n: %d, clz(n): %d, popcount(n): %d, ctz(n): %d\n",

SingleSource/UnitTests/Integer/Makefile

@@ -16,10 +16,8 @@ ENABLE_LARGE_INTEGERS := 0
 # None of these test cases can use a native code generator because
 # those targets are not set up to deal with arbitrary precision
 # integer types. Consequently, we must disable the LLI, LLC, 
-# LLC-BETA, and JIT test cases. This leaves the CBE which can
-# handle the arbitrary precision integers.
+# LLC-BETA, and JIT test cases.
 
-DISABLE_CBE := 1
 DISABLE_LLC := 1
 DISABLE_JIT := 1
 ENABLE_LLI  := 1

SingleSource/UnitTests/Vector/Altivec/Makefile

@@ -6,8 +6,5 @@ LEVEL = ../../../..
 FP_TOLERANCE := 0.002
 include $(LEVEL)/SingleSource/Makefile.singlesrc
 
-# FIXME: CBE doesn't support vectors: PR1126
-DISABLE_CBE=1
-
 TARGET_FLAGS += -maltivec -faltivec
 LCCFLAGS += -maltivec -faltivec

TEST.nightly.Makefile

@@ -19,10 +19,6 @@ ifndef DISABLE_JIT
 REPORTS_TO_GEN +=  jit compile
 REPORT_DEPENDENCIES += $(LLI) $(LOPT)
 endif
-ifndef DISABLE_CBE
-REPORTS_TO_GEN +=  cbe compile
-REPORT_DEPENDENCIES += $(CBE) $(LOPT)
-endif
 ifdef ENABLE_LLCBETA
 REPORTS_TO_GEN += llc-beta compile
 REPORT_DEPENDENCIES += $(LLC) $(LOPT)
@@ -104,20 +100,6 @@ Output/%.nightly.opt-beta.report.txt: Output/%.exe-opt-beta
 	  echo "TEST-FAIL: opt-beta $(RELDIR)/$*" >> $@;\
 	fi
 
-# CBE tests
-$(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
-Output/%.nightly.cbe.report.txt: Output/%.exe-cbe
-	@echo > $@
-	@-if test -f Output/$*.exe-cbe; then \
-	  head -n 100 Output/$*.exe-cbe >> $@; \
-	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
-	  printf "TEST-RESULT-cbe-time: " >> $@;\
-	  grep "^program" Output/$*.out-cbe.time >> $@;\
-	  echo >> $@;\
-	else  \
-	  echo "TEST-FAIL: cbe $(RELDIR)/$*" >> $@;\
-	fi
-
 # JIT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
 Output/%.nightly.jit.report.txt: Output/%.exe-jit

TEST.nightly.report

@@ -20,15 +20,6 @@ sub FormatTime {
   return sprintf("%7.4f", $Time);
 }
 
-sub GCCCBERatio {
-  my ($Cols, $Col) = @_;
-  my $GCC = $Cols->[$Col-6];
-  my $CBE = $Cols->[$Col-5];
-  return "n/a" if ($GCC eq "*" or $CBE eq "*");
-  return sprintf("%3.2f", $GCC/$CBE) if ($GCC >= 0.1 and $CBE >= 0.1);
-  return "-";
-}
-
 sub GCCLLCRatio {
   my ($Cols, $Col) = @_;
   my $GCC = $Cols->[$Col-7];
@@ -77,12 +68,10 @@ $HilightColumns{17} = 1;
  ["JIT codegen" , "TEST-RESULT-jit-comptime: .*$WallTimeRE"],
  [],
  ["GCC"      , 'TEST-RESULT-nat-time: program\s*([.0-9m:]+)', \&FormatTime],
- ["CBE"      , 'TEST-RESULT-cbe-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["LLC"      , 'TEST-RESULT-llc-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["LLC-BETA" , 'TEST-RESULT-llc-beta-time: program\s*([.0-9m:]+)',\&FormatTime],
  ["JIT"      , 'TEST-RESULT-jit-time: program\s*([.0-9m:]+)', \&FormatTime],
  [],
- ["GCC/CBE"  , \&GCCCBERatio],
  ["GCC/LLC"  , \&GCCLLCRatio],
  ["GCC/LLC-BETA"  , \&GCCLLC_BETARatio],
  ["LLC/LLC-BETA"  , \&LLCLLC_BETARatio]

TEST.vtl.Makefile

@@ -17,33 +17,3 @@ P4_EVENTS := "-ec en='2nd Level Cache Read Misses' en='2nd-Level Cache Read Refe
 P3_EVENTS := "-ec en='L2 Cache Request Misses (highly correlated)'"
 
 EVENTS := $(P4_EVENTS)
-
-#
-# Generate events for LLC
-#
-#$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
-#test.$(TEST).%: Output/%.llc
-	#@echo "========================================="
-	#@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-	#$(VERB) $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<
-	#-$(VERB) $(VTL) run $*
-	#-$(VERB) $(VTL) view > $@
-	#$(VERB)  $(VTL) delete $* -f
-
-
-#
-# Generate events for CBE
-#
-$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
-test.$(TEST).%: Output/%.cbe
-	@echo "========================================="
-	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-ifeq ($(RUN_OPTIONS),)
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<
-else
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<,"$(RUN_OPTIONS)"
-endif
-	-$(VERB) $(VTL) run $*
-	-$(VERB) $(VTL) view > $@
-	$(VERB)  $(VTL) delete $* -f
-