aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-12-09 19:43:09 -0800
committerAlon Zakai <alonzakai@gmail.com>2011-12-09 19:43:09 -0800
commit0162cc4bdc1955b442bec1a185d024d3d30cec0e (patch)
treef31f325a14706f4107e34c87b91eb57cd50cbd73
parentcd536b75c1f33f300513dfbc15c1e67ca01bfd80 (diff)
comments
-rw-r--r--settings.py2
-rw-r--r--tests/runner.py13
2 files changed, 9 insertions, 6 deletions
diff --git a/settings.py b/settings.py
index 69f2272f..e4c541f3 100644
--- a/settings.py
+++ b/settings.py
@@ -1,6 +1,8 @@
# This file will be copied to ~/.emscripten if that file doesn't exist. Or, this is that copy.
# IMPORTANT: Edit the *copy* with the right paths!
+EMSCRIPTEN_ROOT = os.path.expanduser('~/Dev/emscripten') # this helps projects using emscripten find it
+
LLVM_ROOT = os.path.expanduser('~/Dev/llvm-3.0/cbuild/bin')
# See below for notes on which JS engine(s) you need
diff --git a/tests/runner.py b/tests/runner.py
index 3b5b03f2..e2fd2be8 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -4755,14 +4755,15 @@ TT = %s
def test_emcc(self):
pass
# TODO: make sure all of these match gcc
+ # TODO: when this is done, more test runner to test these (i.e., test all -Ox thoroughly)
# -- options: check these, warn about errors. valid gcc ones are help, version. Ours should be -- too, not -.
# emcc src.cpp ==> should give a .js file
- # emcc -O0 src.cpp ==> same as without -O0 (i.e., assertions, etc.)
- # emcc -O1 src.cpp ==> no assertions, basic optimizations, plus eliminator, but no reloop
- # emcc -O2 src.cpp ==> plus reloop, plus closure compiler. dangerous, warn! (but not dangerous for simple commandline tests?)
- # emcc -O3 src.cpp ==> no corrections. dangerous, warn!
- # emcc --typed-arrays=x .. ==> should use typed arrays
- # emcc --llvm-opts=x .. ==> pick level of LLVM optimizations (default is 0, to be safe)
+ # emcc -O0 src.cpp ==> same as without -O0: assertions, etc., and greatest chance of code working: i64 1, ta2, etc., micro-opts
+ # emcc -O1 src.cpp ==> no assertions, plus eliminator, plus closure compiler (warn about closure compiler stuff)
+ # emcc -O2 src.cpp ==> plus reloop (warn about speed)
+ # emcc -O3 src.cpp ==> no corrections, relax some other stuff like i64 1 into 0, etc.: dangerous stuff, warn, suggest -O2!
+ # emcc --typed-arrays=x .. ==> should use typed arrays. default should be 2
+ # emcc --llvm-opts=x .. ==> pick level of LLVM optimizations (default is 0, to be safe?)
# emcc src.cpp -c ==> should give a .bc file
# linking - TODO
# annotate each .bc with emscripten info, like "compiled with -O2: do the O2 opts when going to final .js"