diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6639c0156fd45349e4cc06d20bfaf227752ec810..e9386bde049f0ad03fd44ed599481d537cb5da47 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -20,10 +20,10 @@
AUTOMAKE_OPTIONS=gnu
# Add the source directory and debug to CFLAGS
-AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 \
- # -fsanitize=address -fno-omit-frame-pointer
+AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 -DTIMERS \
+ -fsanitize=address -fno-omit-frame-pointer
-AM_LDFLAGS = -lm # -fsanitize=address
+AM_LDFLAGS = -lm -fsanitize=address
# Set-up the library
bin_PROGRAMS = test test_qr test_bh
@@ -36,7 +36,7 @@ test_LDADD = ../src/.libs/libquicksched.a
# Sources for test_qr
test_qr_SOURCES = test_qr.c
test_qr_CFLAGS = $(AM_CFLAGS)
-test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -llapack -lblas
+test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -lblas
# Sources for test_bh
test_bh_SOURCES = test_bh.c
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 0416eb5d73e049b75fef49cf172381810d2ea0ab..711c022606af934ed71b399757c9559766e5d019 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -33,6 +33,23 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -108,6 +125,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(test_SOURCES) $(test_bh_SOURCES) $(test_qr_SOURCES)
DIST_SOURCES = $(test_SOURCES) $(test_bh_SOURCES) $(test_qr_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -126,6 +148,7 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
@@ -173,6 +196,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -186,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PRTDIAG = @PRTDIAG@
@@ -203,6 +228,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
acx_pthread_config = @acx_pthread_config@
@@ -236,7 +262,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -257,10 +282,10 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = gnu
# Add the source directory and debug to CFLAGS
-AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 \
- # -fsanitize=address -fno-omit-frame-pointer
+AM_CFLAGS = -g -Wall -Werror -I../src $(OPENMP_CFLAGS) -DCPU_TPS=2.67e9 -DTIMERS \
+ -fsanitize=address -fno-omit-frame-pointer
-AM_LDFLAGS = -lm # -fsanitize=address
+AM_LDFLAGS = -lm -fsanitize=address
# Sources for test
test_SOURCES = test.c
@@ -270,7 +295,7 @@ test_LDADD = ../src/.libs/libquicksched.a
# Sources for test_qr
test_qr_SOURCES = test_qr.c
test_qr_CFLAGS = $(AM_CFLAGS)
-test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -llapack -lblas
+test_qr_LDADD = ../src/.libs/libquicksched.a -llapacke -lblas
# Sources for test_bh
test_bh_SOURCES = test_bh.c
@@ -312,8 +337,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p || test -f $$p1; \
@@ -353,13 +381,13 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES)
+test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES)
@rm -f test$(EXEEXT)
$(test_LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
-test_bh$(EXEEXT): $(test_bh_OBJECTS) $(test_bh_DEPENDENCIES)
+test_bh$(EXEEXT): $(test_bh_OBJECTS) $(test_bh_DEPENDENCIES) $(EXTRA_test_bh_DEPENDENCIES)
@rm -f test_bh$(EXEEXT)
$(test_bh_LINK) $(test_bh_OBJECTS) $(test_bh_LDADD) $(LIBS)
-test_qr$(EXEEXT): $(test_qr_OBJECTS) $(test_qr_DEPENDENCIES)
+test_qr$(EXEEXT): $(test_qr_OBJECTS) $(test_qr_DEPENDENCIES) $(EXTRA_test_qr_DEPENDENCIES)
@rm -f test_qr$(EXEEXT)
$(test_qr_LINK) $(test_qr_OBJECTS) $(test_qr_LDADD) $(LIBS)
@@ -541,10 +569,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/examples/mkplots_tasks.m b/examples/mkplots_tasks.m
index 5b53886245739cd0f0bf42ab4d546e7c26aa962b..6c9160da86128b28760ea03975c49fb735ca8936 100644
--- a/examples/mkplots_tasks.m
+++ b/examples/mkplots_tasks.m
@@ -58,7 +58,7 @@ maxd = max( [ tasks(:,3) ; tasks(:,4) ] );
% Init the plot
clf;
subplot('position',[ 0.05 , 0.1 , 0.9 , 0.8 ]);
-colours = [ 1 0 0 ; 1 1 0 ; 0 1 0 ; 0 0 1 ];
+colours = [ 255 34 0 ; 130 255 0 ; 0 184 255 ; 255 237 0 ] / 255;
hold on;
% Plot the tasks
diff --git a/examples/test_bh.c b/examples/test_bh.c
index 26e9ce39f7d084f956ba1a9fab96097c85aadd61..db9ea4484ee46c0b6720344c7f80d2e613ef799d 100644
--- a/examples/test_bh.c
+++ b/examples/test_bh.c
@@ -696,6 +696,10 @@ void test_bh ( int N , int nr_threads , int runs ) {
/* Dump the costs. */
message( "costs: setup=%lli ticks, run=%lli ticks." ,
tot_setup , tot_run/runs );
+
+ /* Dump the timers. */
+ for ( k = 0 ; k < qsched_timer_count ; k++ )
+ message( "timer %s is %lli ticks." , qsched_timer_names[k] , s.timers[k]/runs );
/* Clean up. */
qsched_free( &s );
diff --git a/examples/test_qr.c b/examples/test_qr.c
index aa43cf6f87e8bc5732a46a137e6d3ec6c7724a05..2a754c04d4976e138170aaaf261bfcd8afe77ba5 100644
--- a/examples/test_qr.c
+++ b/examples/test_qr.c
@@ -366,6 +366,13 @@ void test_qr ( int m , int n , int K , int nr_threads , int runs ) {
} /* build the tasks. */
tot_setup = getticks() - tic;
+
+ /* Dump the number of tasks. */
+ message( "total nr of tasks: %i." , s.count );
+ message( "total nr of deps: %i." , s.count_deps );
+ message( "total nr of res: %i." , s.count_res );
+ message( "total nr of locks: %i." , s.count_locks );
+ message( "total nr of uses: %i." , s.count_uses );
/* Loop over the number of runs. */
@@ -409,6 +416,10 @@ void test_qr ( int m , int n , int K , int nr_threads , int runs ) {
message( "costs: setup=%lli ticks, run=%lli ticks." ,
tot_setup , tot_run/runs );
+ /* Dump the timers. */
+ for ( k = 0 ; k < qsched_timer_count ; k++ )
+ message( "timer %s is %lli ticks." , qsched_timer_names[k] , s.timers[k]/runs );
+
/* Clean up. */
qsched_free( &s );