Author: dgilmore
Date: 2012-08-19 19:53:31 -0400 (Sun, 19 Aug 2012)
New Revision: 4008
Modified:
trunk/configure
trunk/configure.ac
trunk/osprey/Makefile.gsetup.in
trunk/osprey/crayf90/fe90/Makefile.gbase
trunk/osprey/crayf90/fe90/debug.h
trunk/osprey/crayf90/fe90/globals.h
trunk/osprey/crayf90/sgi/Makefile.gbase
Log:
Add configure option --with-build-ffe-optimize
Allow building FFE with debugging/tracing enabled. Currently building
with --with-build-optimize=DEBUG only builds the FFE with symbolic
debugging.
TODO: cleanup debug-mode assertions in the FFE so that this configure
option is not needed.
CR: David Coakley
Modified: trunk/configure
===================================================================
--- trunk/configure 2012-08-14 01:46:58 UTC (rev 4007)
+++ trunk/configure 2012-08-19 23:53:31 UTC (rev 4008)
@@ -273,7 +273,7 @@
ac_subdirs_all="$ac_subdirs_all osprey/cygnus"
ac_subdirs_all="$ac_subdirs_all osprey-gcc-4.2.0"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os MACHINE_TYPE CROSS_TARGET BUILD_ABI
BUILD_ARCH BUILD_HOST BUILD_TARGET BUILD_VENDOR BUILD_OPTIMIZE
BUILD_LIB_OPTIMIZE BUILD_COMPILER BUILD_BOTH LIB_MACHINE_TYPE LIB_BUILD_TARGET
LIB_BUILD_ABI LIB_BUILD_ARCH LIB_BUILD_HOST LIB2_MACHINE_TYPE LIB2_BUILD_TARGET
LIB2_BUILD_ABI LIB2_BUILD_ARCH LIB2_BUILD_HOST BUILD_MULTILIB COMPILER_TARG_DIR
TARG_INFO_NAME BUILD_GNU3 BUILD_FORTRAN BUILD_SKIP_IPA BUILD_TYPE
GCC_CONFIGURE_TARG GCC_DIR LIBLIST subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os MACHINE_TYPE CROSS_TARGET BUILD_ABI
BUILD_ARCH BUILD_HOST BUILD_TARGET BUILD_VENDOR BUILD_OPTIMIZE
BUILD_FFE_OPTIMIZE BUILD_LIB_OPTIMIZE BUILD_COMPILER BUILD_BOTH
LIB_MACHINE_TYPE LIB_BUILD_TARGET LIB_BUILD_ABI LIB_BUILD_ARCH LIB_BUILD_HOST
LIB2_MACHINE_TYPE LIB2_BUILD_TARGET LIB2_BUILD_ABI LIB2_BUILD_ARCH
LIB2_BUILD_HOST BUILD_MULTILIB COMPILER_TARG_DIR TARG_INFO_NAME BUILD_GNU3
BUILD_FORTRAN BUILD_SKIP_IPA BUILD_TYPE GCC_CONFIGURE_TARG GCC_DIR LIBLIST
subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -801,6 +801,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-build-compiler=GNU|OSP Use GNU or OSP compilers in build
--with-build-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in compiler
build
+ --with-build-ffe-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in FFE
build
--with-build-lib-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in
library build.
Note that --with-build-lib-optimize=DEBUG is currently not well tested.
@@ -1426,7 +1427,18 @@
;;
esac
+# TODO cleanup Fortran Front-End (FFE) so that extra debugging checks
+# can be enabled when BUILD_OPTIMIZE is set to DEBUG.
+# Check whether --with-build-ffe-optimize or --without-build-ffe-optimize was
given.
+if test "${with_build_ffe_optimize+set}" = set; then
+ withval="$with_build_ffe_optimize"
+ BUILD_FFE_OPTIMIZE="$with_build_ffe_optimize"
+else
+ BUILD_FFE_OPTIMIZE=DEFAULT
+fi;
+
+
# Check whether --with-build-lib-optimize or --without-build-lib-optimize was
given.
if test "${with_build_lib_optimize+set}" = set; then
withval="$with_build_lib_optimize"
@@ -1743,6 +1755,7 @@
+
# List of configurable files to create in object directory.
ac_config_files="$ac_config_files Makefile osprey/Makefile.gsetup
osprey/targdir/libspin/Makefile osprey/targdir/libspin_4_2_0/Makefile
osprey/targdir/include/Makefile osprey/targdir/driver/Makefile
osprey/targdir/libiberty/Makefile osprey/targdir/targ_info/Makefile
osprey/targdir/be/Makefile osprey/targdir/libelf/Makefile
osprey/targdir/libelfutil/Makefile osprey/targdir/libdwarf/Makefile
osprey/targdir/libunwindP/Makefile osprey/targdir/cg/Makefile
osprey/targdir/wopt/Makefile osprey/targdir/ipl/Makefile
osprey/targdir/lno/Makefile osprey/targdir/lw_inline/Makefile
osprey/targdir/ipa/Makefile osprey/targdir/whirl2c/Makefile
osprey/targdir/libcomutil/Makefile osprey/targdir/ir_tools/Makefile
osprey/targdir/libcmplrs/Makefile osprey/targdir/wgen/Makefile
osprey/targdir/libcif/Makefile osprey/targdir/arith/Makefile
osprey/targdir/orc_ict/Makefile osprey/targdir/orc_intel/Makefile
osprey/targdir/libkapi/Makefile"
@@ -2544,6 +2557,7 @@
s,@BUILD_TARGET@,$BUILD_TARGET,;t t
s,@BUILD_VENDOR@,$BUILD_VENDOR,;t t
s,@BUILD_OPTIMIZE@,$BUILD_OPTIMIZE,;t t
+s,@BUILD_FFE_OPTIMIZE@,$BUILD_FFE_OPTIMIZE,;t t
s,@BUILD_LIB_OPTIMIZE@,$BUILD_LIB_OPTIMIZE,;t t
s,@BUILD_COMPILER@,$BUILD_COMPILER,;t t
s,@BUILD_BOTH@,$BUILD_BOTH,;t t
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2012-08-14 01:46:58 UTC (rev 4007)
+++ trunk/configure.ac 2012-08-19 23:53:31 UTC (rev 4008)
@@ -1,4 +1,5 @@
Copyright 2010 Hewlett Packard Company
+Copyright (C) 2012 Advanced Micro Devices, Inc. All Rights Reserved.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -95,6 +96,13 @@
;;
esac
+# TODO cleanup Fortran Front-End (FFE) so that extra debugging checks
+# can be enabled when BUILD_OPTIMIZE is set to DEBUG.
+AC_ARG_WITH(build-ffe-optimize,
+[ --with-build-ffe-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in FFE
build],
+BUILD_FFE_OPTIMIZE="$with_build_ffe_optimize",
+BUILD_FFE_OPTIMIZE=DEFAULT)
+
AC_ARG_WITH(build-lib-optimize,
[ --with-build-lib-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in
library build.
Note that --with-build-lib-optimize=DEBUG is currently not well tested.],
@@ -356,6 +364,7 @@
AC_SUBST([BUILD_TARGET])
AC_SUBST([BUILD_VENDOR])
AC_SUBST([BUILD_OPTIMIZE])
+AC_SUBST([BUILD_FFE_OPTIMIZE])
AC_SUBST([BUILD_LIB_OPTIMIZE])
AC_SUBST([BUILD_COMPILER])
AC_SUBST([BUILD_BOTH])
Modified: trunk/osprey/Makefile.gsetup.in
===================================================================
--- trunk/osprey/Makefile.gsetup.in 2012-08-14 01:46:58 UTC (rev 4007)
+++ trunk/osprey/Makefile.gsetup.in 2012-08-19 23:53:31 UTC (rev 4008)
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# Copyright (C) 2011 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (C) 2011-2012 Advanced Micro Devices, Inc. All Rights Reserved.
#
# Copyright (C) 2010 Hewlett Packard Company
#
@@ -111,6 +111,9 @@
ifndef BUILD_OPTIMIZE
BUILD_OPTIMIZE = @BUILD_OPTIMIZE@
endif
+ifndef BUILD__FFE_OPTIMIZE
+ BUILD_FFE_OPTIMIZE = @BUILD_FFE_OPTIMIZE@
+endif
ifndef BUILD_PCH
BUILD_PCH = DEFAULT
endif
Modified: trunk/osprey/crayf90/fe90/Makefile.gbase
===================================================================
--- trunk/osprey/crayf90/fe90/Makefile.gbase 2012-08-14 01:46:58 UTC (rev
4007)
+++ trunk/osprey/crayf90/fe90/Makefile.gbase 2012-08-19 23:53:31 UTC (rev
4008)
@@ -1,5 +1,6 @@
# -*- Makefile -*-
#
+# Copyright (C) 2012 Advanced Micro Devices, Inc. All Rights Reserved.
# Copyright (C) 2000, 2001 Silicon Graphics, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
@@ -79,7 +80,7 @@
# need to define _LONGLONG and _SVR4_SOURCE to allow compilation with -ansi.
HOSTDEFS += -D_LONGLONG -D_SVR4_SOURCE
-ifeq ($(BUILD_VARIANT), DEBUG)
+ifeq ($(BUILD_FFE_OPTIMIZE), DEBUG)
HOSTDEFS += -DIs_True_On
HOSTDEFS += -DInsist_On
endif
@@ -190,7 +191,7 @@
LCOPTS += $(STD_COMPILE_OPTS) $(STD_C_OPTS)
LCINCS = $(addprefix -I, $(HEADER_DIRS))
-ifeq ($(BUILD_VARIANT), DEBUG)
+ifeq ($(BUILD_FFE_OPTIMIZE), DEBUG)
LCDEFS += -D_DEBUG
endif
Modified: trunk/osprey/crayf90/fe90/debug.h
===================================================================
--- trunk/osprey/crayf90/fe90/debug.h 2012-08-14 01:46:58 UTC (rev 4007)
+++ trunk/osprey/crayf90/fe90/debug.h 2012-08-19 23:53:31 UTC (rev 4008)
@@ -1,4 +1,8 @@
/*
+ * Copyright (C) 2012 Advanced Micro Devices, Inc. All Rights Reserved.
+ */
+
+/*
* Copyright (C) 2006. QLogic Corporation. All Rights Reserved.
*/
@@ -1238,6 +1242,8 @@
"Nofusion_Star_Opr",
"Noblocking_Dir_Opr",
"Opaque_Star_Opr",
+ "Purpleconditional_Star_Opr",
+ "Purpleunconditional_Star_Opr",
"Redistribute_Dollar_Opr",
"Doacross_Dollar_Opr",
Modified: trunk/osprey/crayf90/fe90/globals.h
===================================================================
--- trunk/osprey/crayf90/fe90/globals.h 2012-08-14 01:46:58 UTC (rev 4007)
+++ trunk/osprey/crayf90/fe90/globals.h 2012-08-19 23:53:31 UTC (rev 4008)
@@ -1,4 +1,8 @@
/*
+ * Copyright (C) 2012 Advanced Micro Devices, Inc. All Rights Reserved.
+ */
+
+/*
* Copyright (C) 2006. QLogic Corporation. All Rights Reserved.
*/
@@ -1358,6 +1362,8 @@
Opaque_Star_Opr,
Redistribute_Dollar_Opr,
Doacross_Dollar_Opr,
+ Purpleconditional_Star_Opr,
+ Purpleunconditional_Star_Opr,
Pdo_Par_Opr,
Parallel_Do_Par_Opr,
Parallel_Par_Opr,
Modified: trunk/osprey/crayf90/sgi/Makefile.gbase
===================================================================
--- trunk/osprey/crayf90/sgi/Makefile.gbase 2012-08-14 01:46:58 UTC (rev
4007)
+++ trunk/osprey/crayf90/sgi/Makefile.gbase 2012-08-19 23:53:31 UTC (rev
4008)
@@ -1,4 +1,5 @@
# -*- Makefile -*-
+# Copyright (C) 2010, 2012 Advanced Micro Devices, Inc. All Rights Reserved.
#
# Copyright (C) 2006. QLogic Corporation. All Rights Reserved.
#
@@ -109,7 +110,7 @@
# need to define _LONGLONG and _SVR4_SOURCE to allow compilation with -ansi.
HOSTDEFS += -D_LONGLONG -D_SVR4_SOURCE
-ifeq ($(BUILD_VARIANT), DEBUG)
+ifeq ($(BUILD_FFE_OPTIMIZE), DEBUG)
HOSTDEFS += -DIs_True_On
HOSTDEFS += -DInsist_On
endif
@@ -253,7 +254,7 @@
LCXXOPTS += $(STD_COMPILE_OPTS)
-ifeq ($(BUILD_VARIANT), DEBUG)
+ifeq ($(BUILD_FFE_OPTIMIZE), DEBUG)
LCDEFS += -D_DEBUG
LCXXDEFS += -D_DEBUG
endif
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Open64-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/open64-devel
