From 279323b5fd183532be267aeb5ce060764d547063 Mon Sep 17 00:00:00 2001 From: gladman Date: Thu, 2 Apr 2009 11:00:00 +0000 Subject: [PATCH] Update Windows build for latest changes --- .../dll_mpir_amd64/dll_mpir_amd64.vcproj | 4 ++ .../dll_mpir_core2/dll_mpir_core2.vcproj | 4 ++ build.vc9/dll_mpir_gc/dll_mpir_gc.vcproj | 4 ++ build.vc9/dll_mpir_p0/dll_mpir_p0.vcproj | 4 ++ build.vc9/dll_mpir_p3/dll_mpir_p3.vcproj | 12 ++++-- build.vc9/dll_mpir_p4/dll_mpir_p4.vcproj | 4 ++ .../lib_mpir_amd64/lib_mpir_amd64.vcproj | 4 ++ .../lib_mpir_core2/lib_mpir_core2.vcproj | 4 ++ build.vc9/lib_mpir_gc/lib_mpir_gc.vcproj | 4 ++ build.vc9/lib_mpir_p0/lib_mpir_p0.vcproj | 4 ++ build.vc9/lib_mpir_p3/lib_mpir_p3.vcproj | 12 ++++-- build.vc9/lib_mpir_p4/lib_mpir_p4.vcproj | 4 ++ gmp-impl.h | 5 +++ mpn/x86_64w/amd64/gmp-mparam.h | 40 +++++++++---------- 14 files changed, 81 insertions(+), 28 deletions(-) diff --git a/build.vc9/dll_mpir_amd64/dll_mpir_amd64.vcproj b/build.vc9/dll_mpir_amd64/dll_mpir_amd64.vcproj index 943dd7f9..81956a75 100644 --- a/build.vc9/dll_mpir_amd64/dll_mpir_amd64.vcproj +++ b/build.vc9/dll_mpir_amd64/dll_mpir_amd64.vcproj @@ -1750,6 +1750,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/dll_mpir_core2/dll_mpir_core2.vcproj b/build.vc9/dll_mpir_core2/dll_mpir_core2.vcproj index b527a2f1..a4ccdf70 100644 --- a/build.vc9/dll_mpir_core2/dll_mpir_core2.vcproj +++ b/build.vc9/dll_mpir_core2/dll_mpir_core2.vcproj @@ -1752,6 +1752,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/dll_mpir_gc/dll_mpir_gc.vcproj b/build.vc9/dll_mpir_gc/dll_mpir_gc.vcproj index dba467f7..5229a9b9 100644 --- a/build.vc9/dll_mpir_gc/dll_mpir_gc.vcproj +++ b/build.vc9/dll_mpir_gc/dll_mpir_gc.vcproj @@ -2823,6 +2823,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/dll_mpir_p0/dll_mpir_p0.vcproj b/build.vc9/dll_mpir_p0/dll_mpir_p0.vcproj index b6c0c9c4..a22e97a1 100644 --- a/build.vc9/dll_mpir_p0/dll_mpir_p0.vcproj +++ b/build.vc9/dll_mpir_p0/dll_mpir_p0.vcproj @@ -6856,6 +6856,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/dll_mpir_p3/dll_mpir_p3.vcproj b/build.vc9/dll_mpir_p3/dll_mpir_p3.vcproj index f20a58c7..d8b8a6d1 100644 --- a/build.vc9/dll_mpir_p3/dll_mpir_p3.vcproj +++ b/build.vc9/dll_mpir_p3/dll_mpir_p3.vcproj @@ -1377,6 +1377,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + @@ -1507,6 +1511,10 @@ RelativePath="..\..\mpn\x86w\p6\mmx\lshift.asm" > + + @@ -1527,10 +1535,6 @@ /> - - diff --git a/build.vc9/dll_mpir_p4/dll_mpir_p4.vcproj b/build.vc9/dll_mpir_p4/dll_mpir_p4.vcproj index b1b18283..5d6a26f0 100644 --- a/build.vc9/dll_mpir_p4/dll_mpir_p4.vcproj +++ b/build.vc9/dll_mpir_p4/dll_mpir_p4.vcproj @@ -6995,6 +6995,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/lib_mpir_amd64/lib_mpir_amd64.vcproj b/build.vc9/lib_mpir_amd64/lib_mpir_amd64.vcproj index 9c229c40..d05294c3 100644 --- a/build.vc9/lib_mpir_amd64/lib_mpir_amd64.vcproj +++ b/build.vc9/lib_mpir_amd64/lib_mpir_amd64.vcproj @@ -3610,6 +3610,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/lib_mpir_core2/lib_mpir_core2.vcproj b/build.vc9/lib_mpir_core2/lib_mpir_core2.vcproj index 48df2e58..241672cb 100644 --- a/build.vc9/lib_mpir_core2/lib_mpir_core2.vcproj +++ b/build.vc9/lib_mpir_core2/lib_mpir_core2.vcproj @@ -3592,6 +3592,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/lib_mpir_gc/lib_mpir_gc.vcproj b/build.vc9/lib_mpir_gc/lib_mpir_gc.vcproj index 8a21ec09..18bd9234 100644 --- a/build.vc9/lib_mpir_gc/lib_mpir_gc.vcproj +++ b/build.vc9/lib_mpir_gc/lib_mpir_gc.vcproj @@ -6266,6 +6266,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/lib_mpir_p0/lib_mpir_p0.vcproj b/build.vc9/lib_mpir_p0/lib_mpir_p0.vcproj index 8ce4c35c..a5634e52 100644 --- a/build.vc9/lib_mpir_p0/lib_mpir_p0.vcproj +++ b/build.vc9/lib_mpir_p0/lib_mpir_p0.vcproj @@ -3288,6 +3288,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/build.vc9/lib_mpir_p3/lib_mpir_p3.vcproj b/build.vc9/lib_mpir_p3/lib_mpir_p3.vcproj index 283360ec..a18e4dff 100644 --- a/build.vc9/lib_mpir_p3/lib_mpir_p3.vcproj +++ b/build.vc9/lib_mpir_p3/lib_mpir_p3.vcproj @@ -3210,6 +3210,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + @@ -3384,10 +3388,6 @@ RelativePath="..\..\mpn\x86w\p6\mmx\lshift.asm" > - - @@ -3408,6 +3408,10 @@ /> + + diff --git a/build.vc9/lib_mpir_p4/lib_mpir_p4.vcproj b/build.vc9/lib_mpir_p4/lib_mpir_p4.vcproj index 0e8f3325..608308db 100644 --- a/build.vc9/lib_mpir_p4/lib_mpir_p4.vcproj +++ b/build.vc9/lib_mpir_p4/lib_mpir_p4.vcproj @@ -2834,6 +2834,10 @@ RelativePath="..\..\mpn\generic\toom4_mul_n.c" > + + diff --git a/gmp-impl.h b/gmp-impl.h index 75748556..470f02fe 100644 --- a/gmp-impl.h +++ b/gmp-impl.h @@ -1034,8 +1034,13 @@ __GMP_DECLSPEC extern gmp_randstate_t __gmp_rands; #define MPN_TOOM4_MUL_N_MINSIZE 32 #define MPN_TOOM7_MUL_N_MINSIZE 56 #define MPN_TOOM3_SQR_N_MINSIZE 17 +#ifdef _MSC_VER +#define MUL_TOOM4_INTERNAL_THRESHOLD 200 +#define MUL_TOOM7_INTERNAL_THRESHOLD 300 +#else #define MUL_TOOM4_INTERNAL_THRESHOLD 550 #define MUL_TOOM7_INTERNAL_THRESHOLD 1000 +#endif #define mpn_sqr_diagonal __MPN(sqr_diagonal) void mpn_sqr_diagonal _PROTO ((mp_ptr, mp_srcptr, mp_size_t)); diff --git a/mpn/x86_64w/amd64/gmp-mparam.h b/mpn/x86_64w/amd64/gmp-mparam.h index c2af5a55..e1471449 100644 --- a/mpn/x86_64w/amd64/gmp-mparam.h +++ b/mpn/x86_64w/amd64/gmp-mparam.h @@ -1,23 +1,24 @@ -/* Generated by tuneup.c, 2009-04-01, system compiler */ +/* Generated by tuneup.c, 2009-04-02, system compiler */ -#define MUL_KARATSUBA_THRESHOLD 26 -#define MUL_TOOM3_THRESHOLD 162 -#define MUL_TOOM4_THRESHOLD 240 +#define MUL_KARATSUBA_THRESHOLD 28 +#define MUL_TOOM3_THRESHOLD 161 +#define MUL_TOOM4_THRESHOLD 818 +#define MUL_TOOM7_THRESHOLD 818 #define SQR_BASECASE_THRESHOLD 0 /* always (native) */ -#define SQR_KARATSUBA_THRESHOLD 34 -#define SQR_TOOM3_THRESHOLD 216 +#define SQR_KARATSUBA_THRESHOLD 36 +#define SQR_TOOM3_THRESHOLD 218 -#define MULLOW_BASECASE_THRESHOLD 0 /* always */ -#define MULLOW_DC_THRESHOLD 93 -#define MULLOW_MUL_N_THRESHOLD 166 +#define MULLOW_BASECASE_THRESHOLD 36 +#define MULLOW_DC_THRESHOLD 119 +#define MULLOW_MUL_N_THRESHOLD 194 #define DIV_SB_PREINV_THRESHOLD 0 /* always */ -#define DIV_DC_THRESHOLD 102 -#define POWM_THRESHOLD 190 +#define DIV_DC_THRESHOLD 91 +#define POWM_THRESHOLD 185 #define GCD_ACCEL_THRESHOLD 3 -#define GCDEXT_THRESHOLD MP_SIZE_T_MAX /* never */ +#define GCDEXT_THRESHOLD 208 #define JACOBI_BASE_METHOD 2 #define DIVREM_1_NORM_THRESHOLD MP_SIZE_T_MAX /* never */ @@ -30,16 +31,15 @@ #define DIVEXACT_1_THRESHOLD 0 /* always (native) */ #define MODEXACT_1_ODD_THRESHOLD 0 /* always (native) */ -#define GET_STR_DC_THRESHOLD 7 -#define GET_STR_PRECOMPUTE_THRESHOLD 10 +#define GET_STR_DC_THRESHOLD 9 +#define GET_STR_PRECOMPUTE_THRESHOLD 11 #define SET_STR_THRESHOLD 8540 -#define MUL_FFT_TABLE { 784, 1568, 3392, 7424, 15360, 45056, 0 } -#define MUL_FFT_MODF_THRESHOLD 800 -#define MUL_FFT_THRESHOLD 7040 +#define MUL_FFT_TABLE { 752, 1696, 3392, 7424, 15360, 28672, 0 } +#define MUL_FFT_MODF_THRESHOLD 912 -#define SQR_FFT_TABLE { 848, 1824, 3776, 7424, 15360, 45056, 0 } -#define SQR_FFT_MODF_THRESHOLD 944 +#define SQR_FFT_TABLE { 880, 1824, 3904, 7424, 17408, 36864, 0 } +#define SQR_FFT_MODF_THRESHOLD 1008 #define SQR_FFT_THRESHOLD 7040 -/* Tuneup completed successfully, took 14 seconds */ \ No newline at end of file +/* Tuneup completed successfully, took 21 seconds */ \ No newline at end of file