From ae502dfabb8628781d4f9079f0cc6c5645354d25 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 21 May 2012 14:15:52 +0000 Subject: [PATCH] .uppdev git-svn-id: svn://ultimatepp.org/upp/trunk@4984 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppdev/AccessKey/add.cpp | 9 +++ uppdev/AccessKey/test.usc | 3 + uppdev/Flex/bench.txt | 133 ++++++++++++++++++++++++++++++++++++++ uppdev/Flex/init | 4 ++ uppdev/Flex/log.txt | 59 +++++++++++++++++ 5 files changed, 208 insertions(+) create mode 100644 uppdev/AccessKey/add.cpp create mode 100644 uppdev/AccessKey/test.usc create mode 100644 uppdev/Flex/bench.txt create mode 100644 uppdev/Flex/init create mode 100644 uppdev/Flex/log.txt diff --git a/uppdev/AccessKey/add.cpp b/uppdev/AccessKey/add.cpp new file mode 100644 index 000000000..924994bf0 --- /dev/null +++ b/uppdev/AccessKey/add.cpp @@ -0,0 +1,9 @@ +#include "AccessKey.h" + + void test() +{ + if(a( && b) + { + } + +} \ No newline at end of file diff --git a/uppdev/AccessKey/test.usc b/uppdev/AccessKey/test.usc new file mode 100644 index 000000000..d25246b10 --- /dev/null +++ b/uppdev/AccessKey/test.usc @@ -0,0 +1,3 @@ +macro "Swap":"Swap Chars" Ctrl+Shift+T { + Execute("cmd.exe"); +} diff --git a/uppdev/Flex/bench.txt b/uppdev/Flex/bench.txt new file mode 100644 index 000000000..06988ef9c --- /dev/null +++ b/uppdev/Flex/bench.txt @@ -0,0 +1,133 @@ +int + +size (times) std::vector Vector Flex + 10 (100000x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 20 (50000x) 0.000 s 0.000 s 0.062 s NBLK:256, blocks:0 + 40 (25000x) 0.000 s 0.000 s 0.063 s NBLK:256, blocks:0 + 80 (12500x) 0.000 s 0.000 s 0.062 s NBLK:256, blocks:0 + 160 (6250x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 320 (3125x) 0.000 s 0.000 s 0.093 s NBLK:256, blocks:1 + 640 (1562x) 0.000 s 0.000 s 0.156 s NBLK:256, blocks:2 + 1280 (781x) 0.000 s 0.000 s 0.188 s NBLK:256, blocks:4 + 2560 (390x) 0.000 s 0.000 s 0.219 s NBLK:256, blocks:9 + 5120 (195x) 0.000 s 0.000 s 0.249 s NBLK:256, blocks:19 + 10240 (97x) 0.000 s 0.000 s 0.359 s NBLK:512, blocks:19 + 20480 (48x) 0.000 s 0.000 s 0.390 s NBLK:512, blocks:39 + 40960 (24x) 0.000 s 0.000 s 0.484 s NBLK:512, blocks:79 + 81920 (12x) 0.000 s 0.000 s 0.531 s NBLK:512, blocks:159 + 163840 (6x) 0.000 s 0.000 s 0.811 s NBLK:2048, blocks:79 + 327680 (3x) 0.000 s 0.000 s 1.030 s NBLK:2048, blocks:159 + + +String +size (times) std::vector Vector Flex + 10 (100000x) 0.000 s 0.000 s 0.124 s NBLK:128, blocks:0 + 20 (50000x) 0.000 s 0.000 s 0.109 s NBLK:128, blocks:0 + 40 (25000x) 0.000 s 0.000 s 0.109 s NBLK:128, blocks:0 + 80 (12500x) 0.000 s 0.000 s 0.125 s NBLK:128, blocks:0 + 160 (6250x) 0.000 s 0.000 s 0.172 s NBLK:128, blocks:1 + 320 (3125x) 0.000 s 0.000 s 0.218 s NBLK:128, blocks:2 + 640 (1562x) 0.000 s 0.000 s 0.327 s NBLK:128, blocks:4 + 1280 (781x) 0.000 s 0.000 s 0.375 s NBLK:128, blocks:9 + 2560 (390x) 0.000 s 0.000 s 0.405 s NBLK:128, blocks:19 + 5120 (195x) 0.000 s 0.000 s 0.484 s NBLK:128, blocks:39 + 10240 (97x) 0.000 s 0.000 s 0.499 s NBLK:256, blocks:39 + 20480 (48x) 0.000 s 0.000 s 0.639 s NBLK:256, blocks:79 + 40960 (24x) 0.000 s 0.000 s 0.812 s NBLK:256, blocks:159 + 81920 (12x) 0.000 s 0.000 s 1.186 s NBLK:256, blocks:319 + 163840 (6x) 0.000 s 0.000 s 1.904 s NBLK:1024, blocks:159 + 327680 (3x) 0.000 s 0.000 s 2.668 s NBLK:1024, blocks:319 + +---- +* u:\upp\out\uppdev\MSC9.Debug_Full.Release\Flex.exe 10.03.2012 13:46:46, user: cxl + +int + +size (times) std::vector Vector Flex + 10 (100000x) 0.000 s 0.000 s 0.094 s NBLK:256, blocks:0 + 20 (50000x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 40 (25000x) 0.000 s 0.000 s 0.062 s NBLK:256, blocks:0 + 80 (12500x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 160 (6250x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 320 (3125x) 0.000 s 0.000 s 0.094 s NBLK:256, blocks:1 + 640 (1562x) 0.000 s 0.000 s 0.141 s NBLK:256, blocks:2 + 1280 (781x) 0.000 s 0.000 s 0.219 s NBLK:256, blocks:4 + 2560 (390x) 0.000 s 0.000 s 0.265 s NBLK:256, blocks:9 + 5120 (195x) 0.000 s 0.000 s 0.265 s NBLK:256, blocks:19 + 10240 (97x) 0.000 s 0.000 s 0.281 s NBLK:256, blocks:39 + 20480 (48x) 0.000 s 0.000 s 0.312 s NBLK:256, blocks:79 + 40960 (24x) 0.000 s 0.000 s 0.374 s NBLK:256, blocks:159 + 81920 (12x) 0.000 s 0.000 s 0.530 s NBLK:256, blocks:319 + 163840 (6x) 0.000 s 0.000 s 0.671 s NBLK:512, blocks:319 + 327680 (3x) 0.000 s 0.000 s 1.029 s NBLK:1024, blocks:319 + + +String +size (times) std::vector Vector Flex + 10 (100000x) 0.000 s 0.000 s 0.141 s NBLK:128, blocks:0 + 20 (50000x) 0.000 s 0.000 s 0.140 s NBLK:128, blocks:0 + 40 (25000x) 0.000 s 0.000 s 0.109 s NBLK:128, blocks:0 + 80 (12500x) 0.000 s 0.000 s 0.156 s NBLK:128, blocks:0 + 160 (6250x) 0.000 s 0.000 s 0.172 s NBLK:128, blocks:1 + 320 (3125x) 0.000 s 0.000 s 0.234 s NBLK:128, blocks:2 + 640 (1562x) 0.000 s 0.000 s 0.280 s NBLK:128, blocks:4 + 1280 (781x) 0.000 s 0.000 s 0.328 s NBLK:128, blocks:9 + 2560 (390x) 0.000 s 0.000 s 0.374 s NBLK:128, blocks:19 + 5120 (195x) 0.000 s 0.000 s 0.437 s NBLK:128, blocks:39 + 10240 (97x) 0.000 s 0.000 s 0.499 s NBLK:256, blocks:39 + 20480 (48x) 0.000 s 0.000 s 0.671 s NBLK:256, blocks:79 + 40960 (24x) 0.000 s 0.000 s 0.936 s NBLK:256, blocks:159 + 81920 (12x) 0.000 s 0.000 s 1.186 s NBLK:256, blocks:319 + 163840 (6x) 0.000 s 0.000 s 1.606 s NBLK:512, blocks:319 + 327680 (3x) 0.000 s 0.000 s 2.652 s NBLK:1024, blocks:319 + +* u:\upp\out\uppdev\MSC9.Debug_Full.Release\Flex.exe 16.03.2012 14:04:34, user: cxl + +int + +size (times) std::vector Vector Flex + 10 (100000x) 0.000 s 0.000 s 0.062 s NBLK:64, blocks:0 + 20 (50000x) 0.000 s 0.000 s 0.063 s NBLK:64, blocks:0 + 40 (25000x) 0.000 s 0.000 s 0.046 s NBLK:64, blocks:0 + 80 (12500x) 0.000 s 0.000 s 0.062 s NBLK:64, blocks:1 + 160 (6250x) 0.000 s 0.000 s 0.094 s NBLK:64, blocks:2 + 320 (3125x) 0.000 s 0.000 s 0.109 s NBLK:64, blocks:4 + 640 (1562x) 0.000 s 0.000 s 0.140 s NBLK:64, blocks:9 + 1280 (781x) 0.000 s 0.000 s 0.156 s NBLK:128, blocks:9 + 2560 (390x) 0.000 s 0.000 s 0.187 s NBLK:128, blocks:19 + 5120 (195x) 0.000 s 0.000 s 0.218 s NBLK:128, blocks:39 + 10240 (97x) 0.000 s 0.000 s 0.265 s NBLK:256, blocks:39 + 20480 (48x) 0.000 s 0.000 s 0.297 s NBLK:256, blocks:79 + 40960 (24x) 0.000 s 0.000 s 0.375 s NBLK:512, blocks:79 + 81920 (12x) 0.000 s 0.000 s 0.468 s NBLK:512, blocks:159 + 163840 (6x) 0.000 s 0.000 s 0.624 s NBLK:1024, blocks:159 + 327680 (3x) 0.000 s 0.000 s 0.873 s NBLK:2048, blocks:159 +Total Elapsed 4039 ms + + +String +size (times) std::vector Vector Flex + 10 (100000x) 0.000 s 0.000 s 0.109 s NBLK:32, blocks:0 + 20 (50000x) 0.000 s 0.000 s 0.093 s NBLK:32, blocks:0 + 40 (25000x) 0.000 s 0.000 s 0.109 s NBLK:32, blocks:1 + 80 (12500x) 0.000 s 0.000 s 0.141 s NBLK:32, blocks:2 + 160 (6250x) 0.000 s 0.000 s 0.172 s NBLK:32, blocks:4 + 320 (3125x) 0.000 s 0.000 s 0.203 s NBLK:32, blocks:9 + 640 (1562x) 0.000 s 0.000 s 0.234 s NBLK:64, blocks:9 + 1280 (781x) 0.000 s 0.000 s 0.281 s NBLK:128, blocks:9 + 2560 (390x) 0.000 s 0.000 s 0.343 s NBLK:128, blocks:19 + 5120 (195x) 0.000 s 0.000 s 0.421 s NBLK:128, blocks:39 + 10240 (97x) 0.000 s 0.000 s 0.499 s NBLK:256, blocks:39 + 20480 (48x) 0.000 s 0.000 s 0.624 s NBLK:256, blocks:79 + 40960 (24x) 0.000 s 0.000 s 0.858 s NBLK:512, blocks:79 + 81920 (12x) 0.000 s 0.000 s 1.186 s NBLK:512, blocks:159 + 163840 (6x) 0.000 s 0.000 s 1.794 s NBLK:1024, blocks:159 + 327680 (3x) 0.000 s 0.000 s 2.745 s NBLK:2048, blocks:159 +Total Elapsed 9812 ms + + + + + + + diff --git a/uppdev/Flex/init b/uppdev/Flex/init new file mode 100644 index 000000000..733b47486 --- /dev/null +++ b/uppdev/Flex/init @@ -0,0 +1,4 @@ +#ifndef _Flex_icpp_init_stub +#define _Flex_icpp_init_stub +#include "Core/init" +#endif diff --git a/uppdev/Flex/log.txt b/uppdev/Flex/log.txt new file mode 100644 index 000000000..54caa911f --- /dev/null +++ b/uppdev/Flex/log.txt @@ -0,0 +1,59 @@ +* u:\upp\out\uppdev\MSC9.Debug_Full.Release\Flex.exe 16.03.2012 09:06:41, user: cxl + + +size (times) std::vector Vector Flex + 8 (125000x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 16 (62500x) 0.000 s 0.000 s 0.062 s NBLK:256, blocks:0 + 32 (31250x) 0.000 s 0.000 s 0.063 s NBLK:256, blocks:0 + 64 (15625x) 0.000 s 0.000 s 0.062 s NBLK:256, blocks:0 + 128 (7812x) 0.000 s 0.000 s 0.078 s NBLK:256, blocks:0 + 256 (3906x) 0.000 s 0.000 s 0.094 s NBLK:256, blocks:0 + 512 (1953x) 0.000 s 0.000 s 0.125 s NBLK:256, blocks:1 + 1024 (976x) 0.000 s 0.000 s 0.171 s NBLK:256, blocks:3 + 2048 (488x) 0.000 s 0.000 s 0.203 s NBLK:256, blocks:7 + 4096 (244x) 0.000 s 0.000 s 0.249 s NBLK:256, blocks:15 + 8192 (122x) 0.000 s 0.000 s 0.266 s NBLK:256, blocks:31 + 16384 (61x) 0.000 s 0.000 s 0.296 s NBLK:256, blocks:63 + 32768 (30x) 0.000 s 0.000 s 0.343 s NBLK:512, blocks:63 + 65536 (15x) 0.000 s 0.000 s 0.437 s NBLK:512, blocks:127 +Total Elapsed 2527 ms + +* u:\upp\out\uppdev\MSC9.Debug_Full.Release\Flex.exe 16.03.2012 09:00:51, user: cxl + + +size (times) std::vector Vector Flex + 8 (125000x) 0.000 s 0.000 s 0.078 s NBLK:16, blocks:0 + 16 (62500x) 0.000 s 0.000 s 0.063 s NBLK:16, blocks:0 + 32 (31250x) 0.000 s 0.000 s 0.078 s NBLK:16, blocks:1 + 64 (15625x) 0.000 s 0.000 s 0.078 s NBLK:16, blocks:3 + 128 (7812x) 0.000 s 0.000 s 0.078 s NBLK:32, blocks:3 + 256 (3906x) 0.000 s 0.000 s 0.109 s NBLK:32, blocks:7 + 512 (1953x) 0.000 s 0.000 s 0.141 s NBLK:64, blocks:7 + 1024 (976x) 0.000 s 0.000 s 0.156 s NBLK:64, blocks:15 + 2048 (488x) 0.000 s 0.000 s 0.187 s NBLK:64, blocks:31 + 4096 (244x) 0.000 s 0.000 s 0.218 s NBLK:128, blocks:31 + 8192 (122x) 0.000 s 0.000 s 0.250 s NBLK:128, blocks:63 + 16384 (61x) 0.000 s 0.000 s 0.312 s NBLK:256, blocks:63 + 32768 (30x) 0.000 s 0.000 s 0.359 s NBLK:512, blocks:63 + 65536 (15x) 0.000 s 0.000 s 0.437 s NBLK:512, blocks:127 +Total Elapsed 2544 ms + +* u:\upp\out\uppdev\MSC9.Debug_Full.Release\Flex.exe 16.03.2012 09:07:31, user: cxl + + +size (times) std::vector Vector Flex + 8 (125000x) 0.000 s 0.000 s 0.078 s NBLK:64, blocks:0 + 16 (62500x) 0.000 s 0.000 s 0.063 s NBLK:64, blocks:0 + 32 (31250x) 0.000 s 0.000 s 0.062 s NBLK:64, blocks:0 + 64 (15625x) 0.000 s 0.000 s 0.062 s NBLK:64, blocks:0 + 128 (7812x) 0.000 s 0.000 s 0.094 s NBLK:64, blocks:1 + 256 (3906x) 0.000 s 0.000 s 0.109 s NBLK:64, blocks:3 + 512 (1953x) 0.000 s 0.000 s 0.141 s NBLK:64, blocks:7 + 1024 (976x) 0.000 s 0.000 s 0.156 s NBLK:64, blocks:15 + 2048 (488x) 0.000 s 0.000 s 0.172 s NBLK:64, blocks:31 + 4096 (244x) 0.000 s 0.000 s 0.203 s NBLK:128, blocks:31 + 8192 (122x) 0.000 s 0.000 s 0.250 s NBLK:128, blocks:63 + 16384 (61x) 0.000 s 0.000 s 0.296 s NBLK:256, blocks:63 + 32768 (30x) 0.000 s 0.000 s 0.343 s NBLK:512, blocks:63 + 65536 (15x) 0.000 s 0.000 s 0.437 s NBLK:512, blocks:127 +Total Elapsed 2466 ms