[test-suite] r251601 - Fix two benchmarks not setting STDIN_FILENAME correctly

[Matthias Braun via llvm-commits]

This test did bot do anything before because of the Makefile problems O fixed, might very well be that it has always been endian dependent.
I'm currently at the llvm developers meeting and can't investigate/fix it before monday, so please revert the commit if necessary.

- Matthias

> On Oct 30, 2015, at 7:41 AM, Bill Seurer <seurer at linux.vnet.ibm.com> wrote:
> 
> For some reason this revision causes a failure on big endian power (but not little endian).  Is there something endian related in the test case?
> 
> http://lab.llvm.org:8011/builders/clang-ppc64-elf-linux/builds/11956
> 
>> On 10/28/15 22:46, Matthias Braun via llvm-commits wrote:
>> Author: matze
>> Date: Wed Oct 28 22:46:25 2015
>> New Revision: 251601
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=251601&view=rev
>> Log:
>> Fix two benchmarks not setting STDIN_FILENAME correctly
>> 
>> In effect both had /dev/null as input and didn't compute much.
>> 
>> Modified:
>>     test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
>>     test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
>>     test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
>>     test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile
>>     test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/telecomm-adpcm.reference_output
>> 
>> Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt?rev=251601&r1=251600&r2=251601&view=diff
>> ==============================================================================
>> --- test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt (original)
>> +++ test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt Wed Oct 28 22:46:25 2015
>> @@ -7,7 +7,8 @@ set(LEVEL ../../../..)
>>  set(PROG office-ispell)
>>  set(CPPFLAGS -Dconst=)
>>  set(LDFLAGS -lm)
>> -set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+ < ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
>> +set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+)
>> +set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
>>  llvm_multisource()
>> 
>>  llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
>> 
>> Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/Makefile?rev=251601&r1=251600&r2=251601&view=diff
>> ==============================================================================
>> --- test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/Makefile (original)
>> +++ test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/Makefile Wed Oct 28 22:46:25 2015
>> @@ -3,6 +3,7 @@ LEVEL = ../../../..
>>  PROG     = office-ispell
>>  CPPFLAGS = -Dconst=
>>  LDFLAGS  = -lm
>> -RUN_OPTIONS = -a -d $(PROJ_SRC_DIR)/americanmed+ < $(PROJ_SRC_DIR)/large.txt
>> +RUN_OPTIONS = -a -d $(PROJ_SRC_DIR)/americanmed+
>> +STDIN_FILENAME = $(PROJ_SRC_DIR)/large.txt
>> 
>>  include $(LEVEL)/MultiSource/Makefile.multisrc
>> 
>> Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt?rev=251601&r1=251600&r2=251601&view=diff
>> ==============================================================================
>> --- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt (original)
>> +++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt Wed Oct 28 22:46:25 2015
>> @@ -6,7 +6,8 @@ set(PARALLEL_DIRS)
>>  set(LEVEL ../../../..)
>>  set(PROG telecomm-adpcm)
>>  set(LDFLAGS -lm)
>> -set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
>> +set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
>> +set(HASH_PROGRAM_OUTPUT 1)
>>  llvm_multisource()
>> 
>>  llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
>> 
>> Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile?rev=251601&r1=251600&r2=251601&view=diff
>> ==============================================================================
>> --- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile (original)
>> +++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile Wed Oct 28 22:46:25 2015
>> @@ -2,6 +2,7 @@ LEVEL = ../../../..
>> 
>>  PROG     = telecomm-adpcm
>>  LDFLAGS  = -lm
>> -RUN_OPTIONS = < $(PROJ_SRC_DIR)/large.adpcm
>> +STDIN_FILENAME = $(PROJ_SRC_DIR)/large.adpcm
>> +HASH_PROGRAM_OUTPUT = 1
>> 
>>  include $(LEVEL)/MultiSource/Makefile.multisrc
>> 
>> Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/telecomm-adpcm.reference_output
>> URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/telecomm-adpcm.reference_output?rev=251601&r1=251600&r2=251601&view=diff
>> ==============================================================================
>> --- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/telecomm-adpcm.reference_output (original)
>> +++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/telecomm-adpcm.reference_output Wed Oct 28 22:46:25 2015
>> @@ -1,2 +1 @@
>> -Final valprev=0, index=0
>> -exit 0
>> +5ee6e4535a3637085e11a65f11964671
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
> 
> 
> -- 
> 
> -Bill Seurer
>