| commit | 838422b38dfce8b587b4a0aac36014e2a04c43ab | [log] [tgz] |
|---|---|---|
| author | Jack He <siyuanh@google.com> | Wed Apr 08 22:58:07 2020 -0700 |
| committer | Jack He <siyuanh@google.com> | Thu Apr 09 11:43:57 2020 -0700 |
| tree | 9122d68bf61a013cbd07daeb7b61842cab272076 | |
| parent | 7d7adde645081d8f7d4b13967c42a8cbe36ce99a [diff] |
Cert: Improve gd/cert/run performance
For gd/cert/run:
* Remove --reuse_venv option as it does not actually install updated
GD cert python libraries and is causing confusion
* Add --clean option, if omitted, gd/cert/run will not try to re-install
non-GD external libraries during test setup, it will only
- Re-compile all binaries and libraries if needed
- Re-zip everything into bluetooth_cert_tests.zip
- Re-create virtualenv in the same folder without removing the old one
- Unzip bluetooth_cert_tests.zip into the same virtual environment
- Run gd/setup.py build with --force to overwrite any GD libraries
- Run gd/setup.py install with --force and --reuse-acts option,
this will fail if ACTS has never been installed in the virtualenv
- However, all Python libraries, extensions, and binaries from GD
directory will be re-installed regardless
* Enable quiet mode when running setup.py to reduce log spam
For gd/setup.py
* Remove "develop" command as bluetooth_cert_tests.zip is an overlay
library using generated sources and compiled native extensions. It
is not possible to develop and debug GD Python code without
re-compilation and re-zipping everything
* Add "--reuse-acts" option to "install" command so that developer
can choose to re-use existing ACTS installation in an environment.
However, gd/setup.py will validate that "acts" module can be imported
regardless of this option. Without this option, ACTS library will
always be re-installed
* Exclude 'acts_framework.*' correctly
Performance improvement on my machine:
* Command:
time gd/cert/run --host --test_filter=CerSelfTest:test_skip_a_test --clean
* Use --clean (i.e. original performance without this change):
real: 40s
* Without --clean:
real: 17s
* Speed up: 57%
Bug: 153189503
Bug: 151989046
Test: gd/cert/run --host
Test: gd/cert/run --host --clean
Change-Id: I739c62e9be2ad8d8b04df2a267b3dd9c93f3594d
Just build AOSP - Fluoride is there by default.
Instructions for Ubuntu, tested on 14.04 with Clang 3.5.0 and 16.10 with Clang 3.8.0
mkdir ~/fluoride cd ~/fluoride git clone https://android.googlesource.com/platform/packages/modules/Bluetooth/system
Install dependencies (require sudo access):
cd ~/fluoride/bt build/install_deps.sh
Then fetch third party dependencies:
cd ~/fluoride/bt mkdir third_party cd third_party git clone https://github.com/google/googletest.git git clone https://android.googlesource.com/platform/external/aac git clone https://android.googlesource.com/platform/external/libchrome git clone https://android.googlesource.com/platform/external/libldac git clone https://android.googlesource.com/platform/external/modp_b64 git clone https://android.googlesource.com/platform/external/tinyxml2
And third party dependencies of third party dependencies:
cd fluoride/bt/third_party/libchrome/base/third_party mkdir valgrind cd valgrind curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/valgrind.h?format=TEXT | base64 -d > valgrind.h curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/memcheck.h?format=TEXT | base64 -d > memcheck.h
NOTE: If packages/modules/Bluetooth/system is checked out under AOSP, then create symbolic links instead of downloading sources
cd packages/modules/Bluetooth/system mkdir third_party cd third_party ln -s ../../../external/aac aac ln -s ../../../external/libchrome libchrome ln -s ../../../external/libldac libldac ln -s ../../../external/modp_b64 modp_b64 ln -s ../../../external/tinyxml2 tinyxml2 ln -s ../../../external/googletest googletest
cd ~/fluoride/bt gn gen out/Default
cd ~/fluoride/bt ninja -C out/Default all
This will build all targets (the shared library, executables, tests, etc) and put them in out/Default. To build an individual target, replace "all" with the target of your choice, e.g. ninja -C out/Default net_test_osi.
cd ~/fluoride/bt/out/Default LD_LIBRARY_PATH=./ ./bluetoothtbd -create-ipc-socket=fluoride
Follows the Chromium project Eclipse Setup Instructions until "Optional: Building inside Eclipse" section (don't do that section, we will set it up differently)
Generate Eclipse settings:
cd packages/modules/Bluetooth/system gn gen --ide=eclipse out/Default
In Eclipse, do File->Import->C/C++->C/C++ Project Settings, choose the XML location under packages/modules/Bluetooth/system/out/Default
Right click on the project. Go to Preferences->C/C++ Build->Builder Settings. Uncheck "Use default build command", but instead using "ninja -C out/Default"
Goto Behaviour tab, change clean command to "-t clean"