[test-suite] r246395 - Fix test-suite SPEC runs after r246035

[Kristof Beyls via llvm-commits]

Hi Chris,

Thanks for fixing this.

I'm afraid I don't really know why External/SPEC/Makefile.spec seems to repeat
the definitions in Makefile.programs, instead of reusing them.
At first sight, it seems that only the SPEC externals have this issue, i.e.
none of the other Makefiles under "External" seem to have this issue.

Looking at the revision history logs, it seems this duplication has been there
from the initial check-in of External/SPEC/Makefile.spec.

So, my preliminary thought on this is that the technical debt here is
that a lot of the definitions in Makefile.programs are repeated in
External/SPEC/Makefile.spec and this has been the case for over 10 years now.
I think your commit from yesterday didn't make the situation worse - I'm
happy with leaving it as is - until someone finds the time to remove this
together with all the other duplications this Makefile has with Makefile.programs.

All of that being said, it is very well possible I've missed something obvious
here - I'm by no means an expert on these Makefiles.

Thanks,

Kristof

> -----Original Message-----
> From: Chris Matthews [mailto:chris4000 at gmail.com]
> Sent: 31 August 2015 16:53
> To: Kristof Beyls
> Cc: llvm-commits at lists.llvm.org
> Subject: Re: [test-suite] r246395 - Fix test-suite SPEC runs after
> r246035
> 
> Hi Kristof,
> 
> Your hashing patch did not seem to work with a external test suite with
> SPEC in it.  The hashing rule was not defined for the SPEC benchmarks.
> I have done this hack to get it to work, but I’m hoping you have a
> better way to get it to work.  Thanks!
> 
> 
> > On Aug 30, 2015, at 12:24 PM, Chris Matthews via llvm-commits <llvm-
> commits at lists.llvm.org> wrote:
> >
> > Author: cmatthews
> > Date: Sun Aug 30 14:24:25 2015
> > New Revision: 246395
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=246395&view=rev
> > Log:
> > Fix test-suite SPEC runs after r246035
> >
> > Modified:
> >    test-suite/trunk/External/SPEC/Makefile.spec
> >
> > Modified: test-suite/trunk/External/SPEC/Makefile.spec
> > URL: http://llvm.org/viewvc/llvm-project/test-
> suite/trunk/External/SPEC/Makefile.spec?rev=246395&r1=246394&r2=246395&v
> iew=diff
> >
> ========================================================================
> ======
> > --- test-suite/trunk/External/SPEC/Makefile.spec (original)
> > +++ test-suite/trunk/External/SPEC/Makefile.spec Sun Aug 30 14:24:25
> 2015
> > @@ -93,6 +93,18 @@ ifdef PROGRAM_OUTPUT_FILTER
> > 	$(PROGRAM_OUTPUT_FILTER) $@
> > endif
> >
> > +ifeq ($(TARGET_OS),Darwin)
> > +    STRIP_BINARY_FOR_HASH_CMD=echo
> > +else
> > +    STRIP_BINARY_FOR_HASH_CMD=strip --remove-section=.comment --
> remove-section='.note*'
> > +endif
> > +
> > +$(PROGRAMS_TO_TEST:%=Output/%.simple-hash): \
> > +	Output/%.simple-hash: Output/%.simple
> > +		cp $< $@; \
> > +		$(STRIP_BINARY_FOR_HASH_CMD) $@; \
> > +		$(PROGDIR)/HashProgramOutput.sh $@
> > +
> > $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
> > Output/%.out-lli: Output/%.llvm.bc $(LLI)
> > 	$(SPEC_SANDBOX) lli-$(RUN_TYPE) $@ $(REF_IN_DIR) \
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits