Attachment 910819 Details for Bug 1111650 – atlas.Make_ttune_arch_suffix.patch

[patch] atlas.Make_ttune_arch_suffix.patch

atlas.Make_ttune_arch_suffix.patch (text/plain), 4.68 KB, created by Michel Normand on 2014-06-20 16:06:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Normand

Created: 2014-06-20 16:06:03 UTC

Size: 4.68 KB

patch

obsolete

>From: Michel Normand <normand@linux.vnet.ibm.com>
>Subject: atlas.Make_ttune_arch suffix
>Date: Fri, 18 Apr 2014 12:08:02 +0200
>
>Proposal to have Make.ttune to only try to build the xprobe_atomic_*
>that do match the architecture.
>This will avoid the log to report useless errors.
>
>TODO:
>The first step here with locally hardcoded ARCH_SUFFIX = ppc
>but will need to be set to either:
>amd64 win64 ia32 sparc mips ppc
>
>Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>---
> CONFIG/src/SpewMakeInc.c |    6 ++++++
> makes/Make.ttune         |   40 ++++------------------------------------
> 2 files changed, 10 insertions(+), 36 deletions(-)
>
>Index: ATLAS/makes/Make.ttune
>===================================================================
>--- ATLAS.orig/makes/Make.ttune
>+++ ATLAS/makes/Make.ttune
>@@ -157,46 +157,14 @@ iTune_atomic :
>            $(MAKE) iFind_atomic_arch ; \
>         fi
> iFind_atomic_arch :
>-	if $(MAKE) xprobe_atomic_amd64 ; then \
>+	if $(MAKE) xprobe_atomic_$(ARCH_SUFFIX) ; then \
>            cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
>-           cp $(myTHRdir)/ATL_ResetAtomicCount_amd64.S \
>+           cp $(myTHRdir)/ATL_ResetAtomicCount_$(ARCH_SUFFIX).S \
>               ATL_ResetAtomicCount_arch.S ; \
>-           cp $(myTHRdir)/ATL_DecAtomicCount_amd64.S \
>+           cp $(myTHRdir)/ATL_DecAtomicCount_$(ARCH_SUFFIX).S \
>               ATL_DecAtomicCount_arch.S ; \
>            rm $(BLDdir)/src/threads/atomic.inc ; \
>-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_amd64.o ATL_DecAtomicCount_amd64.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
>-	elif $(MAKE) xprobe_atomic_win64 ; then \
>-           cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
>-           cp $(myTHRdir)/ATL_ResetAtomicCount_win64.S \
>-              ATL_ResetAtomicCount_arch.S ; \
>-           cp $(myTHRdir)/ATL_DecAtomicCount_win64.S \
>-              ATL_DecAtomicCount_arch.S ; \
>-           rm $(BLDdir)/src/threads/atomic.inc ; \
>-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_win64.o ATL_DecAtomicCount_win64.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
>-	elif $(MAKE) xprobe_atomic_ia32 ; then \
>-           cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
>-           cp $(myTHRdir)/ATL_ResetAtomicCount_ia32.S \
>-              ATL_ResetAtomicCount_arch.S ; \
>-           cp $(myTHRdir)/ATL_DecAtomicCount_ia32.S \
>-              ATL_DecAtomicCount_arch.S ; \
>-           rm $(BLDdir)/src/threads/atomic.inc ; \
>-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_ia32.o ATL_DecAtomicCount_ia32.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
>-	elif $(MAKE) xprobe_atomic_sparc ; then \
>-           cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
>-           cp $(myTHRdir)/ATL_ResetAtomicCount_sparc.S \
>-              ATL_ResetAtomicCount_arch.S ; \
>-           cp $(myTHRdir)/ATL_DecAtomicCount_sparc.S \
>-              ATL_DecAtomicCount_arch.S ; \
>-           rm $(BLDdir)/src/threads/atomic.inc ; \
>-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_sparc.o ATL_DecAtomicCount_sparc.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
>-	elif $(MAKE) xprobe_atomic_mips ; then \
>-           cp $(myTHRdir)/ATL_*AtomicCount_arch.c . ; \
>-           cp $(myTHRdir)/ATL_ResetAtomicCount_mips.S \
>-              ATL_ResetAtomicCount_arch.S ; \
>-           cp $(myTHRdir)/ATL_DecAtomicCount_mips.S \
>-              ATL_DecAtomicCount_arch.S ; \
>-           rm $(BLDdir)/src/threads/atomic.inc ; \
>-           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_mips.o ATL_DecAtomicCount_mips.o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
>+           echo "aobj = ATL_SetAtomicCount_arch.o ATL_ResetAtomicCount_$(ARCH_SUFFIX).o ATL_DecAtomicCount_$(ARCH_SUFFIX).o ATL_FreeAtomicCount_arch.o" > $(BLDdir)/src/threads/atomic.inc ; \
>         else \
>            $(MAKE) iForceUseMutex ; \
>         fi
>Index: ATLAS/CONFIG/src/SpewMakeInc.c
>===================================================================
>--- ATLAS.orig/CONFIG/src/SpewMakeInc.c
>+++ ATLAS/CONFIG/src/SpewMakeInc.c
>@@ -552,6 +552,12 @@ int main(int nargs, char **args)
>       fprintf(fpout, "NONIEEE");
>    fprintf(fpout, "\n\n");
> 
>+   fprintf(fpout, "#  ------------------------------\n");
>+   fprintf(fpout, "#  arch suffix used in Make.ttune\n");
>+   fprintf(fpout, "#  TODO should be one of: amd64 win64 ia32 sparc mips ppc\n");
>+   fprintf(fpout, "#  ------------------------------\n");
>+   fprintf(fpout, "   ARCH_SUFFIX = %s\n\n", "ppc");
>+
>    fprintf(fpout, "#  ----------------------------\n");
>    fprintf(fpout, "#  Paths to various directories\n");
>    fprintf(fpout, "#  ----------------------------\n");

Actions: View | Diff

Attachments on bug 1111650: 910819 | 910820