Skip to content

Commit de379ce

Browse files
authored
Remove fastcomp-only FAST_UNROLLED_MEMCPY_AND_MEMSET setting (#11861)
See #11860
1 parent 45d3f10 commit de379ce

File tree

3 files changed

+2
-56
lines changed

3 files changed

+2
-56
lines changed

src/library.js

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -991,29 +991,6 @@ LibraryManager.library = {
991991
num = (num-1)|0;
992992
}
993993
aligned_dest_end = (dest_end & -4)|0;
994-
#if FAST_UNROLLED_MEMCPY_AND_MEMSET
995-
block_aligned_dest_end = (aligned_dest_end - 64)|0;
996-
while ((dest|0) <= (block_aligned_dest_end|0) ) {
997-
{{{ makeSetValueAsm('dest', 0, makeGetValueAsm('src', 0, 'i32'), 'i32') }}};
998-
{{{ makeSetValueAsm('dest', 4, makeGetValueAsm('src', 4, 'i32'), 'i32') }}};
999-
{{{ makeSetValueAsm('dest', 8, makeGetValueAsm('src', 8, 'i32'), 'i32') }}};
1000-
{{{ makeSetValueAsm('dest', 12, makeGetValueAsm('src', 12, 'i32'), 'i32') }}};
1001-
{{{ makeSetValueAsm('dest', 16, makeGetValueAsm('src', 16, 'i32'), 'i32') }}};
1002-
{{{ makeSetValueAsm('dest', 20, makeGetValueAsm('src', 20, 'i32'), 'i32') }}};
1003-
{{{ makeSetValueAsm('dest', 24, makeGetValueAsm('src', 24, 'i32'), 'i32') }}};
1004-
{{{ makeSetValueAsm('dest', 28, makeGetValueAsm('src', 28, 'i32'), 'i32') }}};
1005-
{{{ makeSetValueAsm('dest', 32, makeGetValueAsm('src', 32, 'i32'), 'i32') }}};
1006-
{{{ makeSetValueAsm('dest', 36, makeGetValueAsm('src', 36, 'i32'), 'i32') }}};
1007-
{{{ makeSetValueAsm('dest', 40, makeGetValueAsm('src', 40, 'i32'), 'i32') }}};
1008-
{{{ makeSetValueAsm('dest', 44, makeGetValueAsm('src', 44, 'i32'), 'i32') }}};
1009-
{{{ makeSetValueAsm('dest', 48, makeGetValueAsm('src', 48, 'i32'), 'i32') }}};
1010-
{{{ makeSetValueAsm('dest', 52, makeGetValueAsm('src', 52, 'i32'), 'i32') }}};
1011-
{{{ makeSetValueAsm('dest', 56, makeGetValueAsm('src', 56, 'i32'), 'i32') }}};
1012-
{{{ makeSetValueAsm('dest', 60, makeGetValueAsm('src', 60, 'i32'), 'i32') }}};
1013-
dest = (dest+64)|0;
1014-
src = (src+64)|0;
1015-
}
1016-
#endif
1017994
while ((dest|0) < (aligned_dest_end|0) ) {
1018995
{{{ makeSetValueAsm('dest', 0, makeGetValueAsm('src', 0, 'i32'), 'i32') }}};
1019996
dest = (dest+4)|0;
@@ -1085,30 +1062,6 @@ LibraryManager.library = {
10851062
aligned_end = (end & -4)|0;
10861063
value4 = value | (value << 8) | (value << 16) | (value << 24);
10871064

1088-
#if FAST_UNROLLED_MEMCPY_AND_MEMSET
1089-
block_aligned_end = (aligned_end - 64)|0;
1090-
1091-
while((ptr|0) <= (block_aligned_end|0)) {
1092-
{{{ makeSetValueAsm('ptr', 0, 'value4', 'i32') }}};
1093-
{{{ makeSetValueAsm('ptr', 4, 'value4', 'i32') }}};
1094-
{{{ makeSetValueAsm('ptr', 8, 'value4', 'i32') }}};
1095-
{{{ makeSetValueAsm('ptr', 12, 'value4', 'i32') }}};
1096-
{{{ makeSetValueAsm('ptr', 16, 'value4', 'i32') }}};
1097-
{{{ makeSetValueAsm('ptr', 20, 'value4', 'i32') }}};
1098-
{{{ makeSetValueAsm('ptr', 24, 'value4', 'i32') }}};
1099-
{{{ makeSetValueAsm('ptr', 28, 'value4', 'i32') }}};
1100-
{{{ makeSetValueAsm('ptr', 32, 'value4', 'i32') }}};
1101-
{{{ makeSetValueAsm('ptr', 36, 'value4', 'i32') }}};
1102-
{{{ makeSetValueAsm('ptr', 40, 'value4', 'i32') }}};
1103-
{{{ makeSetValueAsm('ptr', 44, 'value4', 'i32') }}};
1104-
{{{ makeSetValueAsm('ptr', 48, 'value4', 'i32') }}};
1105-
{{{ makeSetValueAsm('ptr', 52, 'value4', 'i32') }}};
1106-
{{{ makeSetValueAsm('ptr', 56, 'value4', 'i32') }}};
1107-
{{{ makeSetValueAsm('ptr', 60, 'value4', 'i32') }}};
1108-
ptr = (ptr + 64)|0;
1109-
}
1110-
#endif
1111-
11121065
while ((ptr|0) < (aligned_end|0) ) {
11131066
{{{ makeSetValueAsm('ptr', 0, 'value4', 'i32') }}};
11141067
ptr = (ptr+4)|0;

src/settings.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
//
3030
// In general it is best to pass the same arguments at both compile and link
3131
// time, as whether wasm object files are used or not affects when codegen
32-
// happens (without wasm object files, or when using fastcomp, codegen is all
33-
// during link; otherwise, it is during compile). Flags affecting codegen must
32+
// happens (without wasm object files, codegen is done entirely during
33+
// link; otherwise, it is during compile). Flags affecting codegen must
3434
// be passed when codegen happens, so to let a build easily switch when codegen
3535
// happens (LTO vs normal), pass the flags at both times. The flags are also
3636
// annotated in this file:
@@ -149,12 +149,6 @@ var MALLOC = "dlmalloc";
149149
// [link]
150150
var ABORTING_MALLOC = 1;
151151

152-
// If 1, generated a version of memcpy() and memset() that unroll their
153-
// copy sizes. If 0, optimizes for size instead to generate a smaller memcpy.
154-
// This flag only has effect when targeting asm.js.
155-
// [fastcomp-only]
156-
var FAST_UNROLLED_MEMCPY_AND_MEMSET = 1;
157-
158152
// The initial amount of memory to use. Using more memory than this will
159153
// cause us to expand the heap, which can be costly with typed arrays:
160154
// we need to copy the old heap into a new one in that case.

tests/test_other.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9039,7 +9039,6 @@ def test_minimal_runtime_code_size(self):
90399039
'-s', 'GL_TRACK_ERRORS=0',
90409040
'-s', 'GL_SUPPORT_EXPLICIT_SWAP_CONTROL=0',
90419041
'-s', 'GL_POOL_TEMP_BUFFERS=0',
9042-
'-s', 'FAST_UNROLLED_MEMCPY_AND_MEMSET=0',
90439042
'-s', 'MIN_CHROME_VERSION=58',
90449043
'-s', 'NO_FILESYSTEM=1',
90459044
'--output_eol', 'linux',

0 commit comments

Comments
 (0)