Changeset: a5a768f33aca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5a768f33aca
Modified Files:
Branch: sciql
Log Message:
merged with default
diffs (67 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -993,17 +993,12 @@
powerpc*-apple-darwin*)
# -fast switch causes arithmetic differences, and slower
# running code for SQL, some faster for M5, so we don't use
- # it. Instead we try a subset of -fast flags:
- # -O3 -falign-loops-max-skip=15 -falign-jumps-max-skip=15
- # -falign-loops=16 -falign-jumps=16 -falign-functions=16
- # -malign-natural -ffast-math -fstrict-aliasing
- # -funroll-loops -ftree-loop-linear -ftree-loop-memset
- # -mcpu=G5 -mpowerpc-gpopt -mtune=G5 -fsched-interblock
- # -fgcse-sm -mpowerpc64
- CFLAGS="-O3 -falign-loops-max-skip=15
-falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16
-falign-functions=16 -fstrict-aliasing -funroll-loops -ftree-loop-linear
-ftree-loop-memset -pipe ${CFLAGS}"
+ # it. Instead we just run with modest -O3 and
+ # -fomit-frame-pointer (we don't intend to debug the binary).
+ CFLAGS="-O3 -fomit-frame-pointer -pipe ${CFLAGS}"
;;
i?86-apple-darwin*|x86_64-apple-darwin*)
- # -fast switch on Intel is a lot less tuned:
+ # -fast switch on Intel is a lot less tuned, and hence safer:
# -O3 -fomit-frame-pointer -fstrict-aliasing
# -momit-leaf-frame-pointer -fno-tree-pre -falign-loops
CFLAGS="-fast -pipe ${CFLAGS}"
@@ -1039,9 +1034,14 @@
# -finline-functions, -funswitch-loops,
# -fpredictive-commoning, -fgcse-after-reload,
# -ftree-vectorize and -fipa-cp-clone
- CFLAGS="-O3 -pipe ${CFLAGS}"
- # the following flag used to be applied, but is discouraged by
- # GCC manpage: -funroll-all-loops
+ CFLAGS="-O3 -fomit-frame-pointer -pipe ${CFLAGS}"
+ # because we explicitly disable debugging, we can explicitly
+ # enable -fomit-frame-pointer here
+ # notes on -funroll-all-loops:
+ # - does nothing on i?86-linux and x86_64-linux
+ # - speeds up and causes crashes on powerpc-linux
+ # - slows down and makes output incorrect on sparc-solaris
+ # - speeds up and fixes some outputs on sparcv9-solaris
;;
esac
;;
diff --git a/monetdb5/extras/crackers/crackers_sortmerge.mx
b/monetdb5/extras/crackers/crackers_sortmerge.mx
--- a/monetdb5/extras/crackers/crackers_sortmerge.mx
+++ b/monetdb5/extras/crackers/crackers_sortmerge.mx
@@ -1045,7 +1045,7 @@
hghResultNode=nexNode;
BBPunfix(slice->batCacheid);
}else{
- @:FullMerge(@1,@2,@3,@4)@ //TODO this
might need to be a mergemid
+ @:FullMerge(@1,@2,@3,@4)@ /* TODO this
might need to be a mergemid */
}
goto done;
}
diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -70,7 +70,7 @@
#define UPD_COMP 1
#define UPD_LOCKED 2
-// todo make enum
+/* todo make enum */
#define DDL_OUTPUT 1
#define DDL_LIST 2
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
