Skip to content

Commit 1f5830f

Browse files
Mark-SimulacrumMark-Simulacrum
authored
Merge pull request #676 from Mark-Simulacrum/script-servo
Update script-servo
2 parents b895911 + 3a1c632 commit 1f5830f

File tree

2,881 files changed

+409374
-299935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,881 files changed

+409374
-299935
lines changed

‎.github/workflows/ci.yml

+62-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ env:
99
AWS_ACCESS_KEY_ID: AKIA46X5W6CZBLO3VBND
1010

1111
jobs:
12-
ci:
13-
name: CI
12+
test_and_deploy:
13+
name: Test and deploy
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout the source code
@@ -32,3 +32,63 @@ jobs:
3232
aws_access_key_id: "${{ env.AWS_ACCESS_KEY_ID }}"
3333
aws_secret_access_key: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
3434
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/deploy'
35+
test_benchmarks:
36+
name: Test benchmarks
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Checkout the source code
40+
uses: actions/checkout@v2
41+
with:
42+
fetch-depth: 1
43+
44+
- name: Install latest nightly
45+
uses: actions-rs/toolchain@v1
46+
with:
47+
toolchain: nightly
48+
override: true
49+
50+
- name: Configure environment
51+
run: |
52+
sudo apt-get update
53+
sudo apt-get install -y linux-tools-common linux-tools-generic linux-tools-`uname -r`
54+
echo -1 | sudo tee /proc/sys/kernel/perf_event_paranoid
55+
56+
- name: Build collector
57+
run: cargo build -p collector
58+
59+
- name: Check benchmarks
60+
run: sh -x -c "ci/check-benchmarks.sh"
61+
env:
62+
COLLECTOR_ARGS: "--exclude script-servo"
63+
test_script_servo:
64+
name: Test benchmark script-servo
65+
runs-on: ubuntu-latest
66+
steps:
67+
- name: Checkout the source code
68+
uses: actions/checkout@v2
69+
with:
70+
fetch-depth: 1
71+
72+
- name: Install latest nightly
73+
uses: actions-rs/toolchain@v1
74+
with:
75+
toolchain: nightly
76+
override: true
77+
78+
- name: Configure environment
79+
run: |
80+
sudo apt-get update
81+
sudo apt-get install -y linux-tools-common linux-tools-generic linux-tools-`uname -r`
82+
echo -1 | sudo tee /proc/sys/kernel/perf_event_paranoid
83+
84+
- name: Install servo dependencies
85+
run: sudo apt-get install -y llvm-dev clang libx11-dev python2.7 autoconf2.13
86+
87+
- name: Build collector
88+
run: cargo build -p collector
89+
90+
- name: Check benchmarks
91+
run: sh -x -c "ci/check-benchmarks.sh"
92+
env:
93+
COLLECTOR_ARGS: "--filter script-servo"
94+
SHELL: "/bin/bash"

‎.travis.yml

-18
This file was deleted.

‎ci/check-benchmarks.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ set -x;
55
bash -c "while true; do sleep 30; echo \$(date) - running ...; done" &
66
PING_LOOP_PID=$!
77
trap - ERR
8-
cargo build -p collector;
9-
RUST_BACKTRACE=1 RUST_LOG=collector=trace,rust_sysroot=debug \
8+
RUST_BACKTRACE=1 RUST_LOG=collector=debug,rust_sysroot=debug \
109
cargo run -p collector --bin collector -- \
1110
--db temporary.db \
12-
--exclude servo,cargo,crates.io,packed-simd,sentry-cli,tuple-stress test_benchmarks;
11+
$COLLECTOR_ARGS \
12+
test_benchmarks;
1313
code=$?
1414
kill $PING_LOOP_PID
1515
exit $code

‎collector/benchmarks/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ These are real programs that are important in some way, and worth tracking.
2020
- **piston-image**: A modular game engine. An interesting Rust program.
2121
- **regex**: A regular expression parser. Used by many Rust programs.
2222
- **ripgrep**: A line-oriented search tool. A widely-used utility.
23-
- **script-servo**: Servo's `script` crate. A particularly large crate.
23+
- **script-servo**: Servo's `script` crate. A particularly large crate. At
24+
5ad7e5b4fbd58, with [PR#27063](https://github.com/servo/servo/pull/27063)
25+
applied atop.
2426
- **serde**: A serialization/deserialization crate. Used by many other
2527
Rust programs.
2628
- **style-servo**: Servo's `style` crate. A large crate, and one used by

‎collector/benchmarks/script-servo-2/.clang-format

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: Mozilla
4+
AccessModifierOffset: -2
5+
AlignAfterOpenBracket: Align
6+
AlignConsecutiveAssignments: false
7+
AlignConsecutiveDeclarations: false
8+
AlignEscapedNewlines: Right
9+
AlignOperands: true
10+
AlignTrailingComments: true
11+
AllowAllParametersOfDeclarationOnNextLine: true
12+
AllowShortBlocksOnASingleLine: false
13+
AllowShortCaseLabelsOnASingleLine: false
14+
AllowShortFunctionsOnASingleLine: All
15+
AllowShortIfStatementsOnASingleLine: false
16+
AllowShortLoopsOnASingleLine: false
17+
AlwaysBreakAfterDefinitionReturnType: None
18+
AlwaysBreakAfterReturnType: None
19+
AlwaysBreakBeforeMultilineStrings: false
20+
AlwaysBreakTemplateDeclarations: MultiLine
21+
BinPackArguments: true
22+
BinPackParameters: true
23+
BraceWrapping:
24+
AfterClass: false
25+
AfterControlStatement: false
26+
AfterEnum: false
27+
AfterFunction: false
28+
AfterNamespace: false
29+
AfterObjCDeclaration: false
30+
AfterStruct: false
31+
AfterUnion: false
32+
AfterExternBlock: false
33+
BeforeCatch: false
34+
BeforeElse: false
35+
IndentBraces: false
36+
SplitEmptyFunction: true
37+
SplitEmptyRecord: true
38+
SplitEmptyNamespace: true
39+
BreakBeforeBinaryOperators: None
40+
BreakBeforeBraces: Attach
41+
BreakBeforeInheritanceComma: false
42+
BreakInheritanceList: BeforeColon
43+
BreakBeforeTernaryOperators: true
44+
BreakConstructorInitializersBeforeComma: false
45+
BreakConstructorInitializers: BeforeColon
46+
BreakAfterJavaFieldAnnotations: false
47+
BreakStringLiterals: true
48+
ColumnLimit: 80
49+
CommentPragmas: '^ IWYU pragma:'
50+
CompactNamespaces: false
51+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
52+
ConstructorInitializerIndentWidth: 4
53+
ContinuationIndentWidth: 4
54+
Cpp11BracedListStyle: true
55+
DerivePointerAlignment: false
56+
DisableFormat: false
57+
ExperimentalAutoDetectBinPacking: false
58+
FixNamespaceComments: true
59+
ForEachMacros:
60+
- foreach
61+
- Q_FOREACH
62+
- BOOST_FOREACH
63+
IncludeBlocks: Preserve
64+
IncludeCategories:
65+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
66+
Priority: 2
67+
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
68+
Priority: 3
69+
- Regex: '.*'
70+
Priority: 1
71+
IncludeIsMainRegex: '(Test)?$'
72+
IndentCaseLabels: false
73+
IndentPPDirectives: None
74+
IndentWidth: 2
75+
IndentWrappedFunctionNames: false
76+
JavaScriptQuotes: Leave
77+
JavaScriptWrapImports: true
78+
KeepEmptyLinesAtTheStartOfBlocks: true
79+
MacroBlockBegin: ''
80+
MacroBlockEnd: ''
81+
MaxEmptyLinesToKeep: 1
82+
NamespaceIndentation: None
83+
ObjCBinPackProtocolList: Auto
84+
ObjCBlockIndentWidth: 2
85+
ObjCSpaceAfterProperty: false
86+
ObjCSpaceBeforeProtocolList: true
87+
PenaltyBreakAssignment: 2
88+
PenaltyBreakBeforeFirstCallParameter: 19
89+
PenaltyBreakComment: 300
90+
PenaltyBreakFirstLessLess: 120
91+
PenaltyBreakString: 1000
92+
PenaltyBreakTemplateDeclaration: 10
93+
PenaltyExcessCharacter: 1000000
94+
PenaltyReturnTypeOnItsOwnLine: 60
95+
PointerAlignment: Right
96+
ReflowComments: true
97+
SortIncludes: false
98+
SortUsingDeclarations: true
99+
SpaceAfterCStyleCast: false
100+
SpaceAfterTemplateKeyword: true
101+
SpaceBeforeAssignmentOperators: true
102+
SpaceBeforeCpp11BracedList: false
103+
SpaceBeforeCtorInitializerColon: true
104+
SpaceBeforeInheritanceColon: true
105+
SpaceBeforeParens: ControlStatements
106+
SpaceBeforeRangeBasedForLoopColon: true
107+
SpaceInEmptyParentheses: false
108+
SpacesBeforeTrailingComments: 1
109+
SpacesInAngles: false
110+
SpacesInContainerLiterals: true
111+
SpacesInCStyleCastParentheses: false
112+
SpacesInParentheses: false
113+
SpacesInSquareBrackets: false
114+
Standard: Cpp11
115+
StatementMacros:
116+
- Q_UNUSED
117+
- QT_REQUIRE_VERSION
118+
TabWidth: 8
119+
UseTab: Never
120+
...
121+

‎collector/benchmarks/script-servo-2/.gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
* text=auto eol=lf
2+
tests/* linguist-vendored
3+
4+
# Denote all files that are truly binary and should not be modified.
5+
*.png binary
6+
*.jpg binary

‎collector/benchmarks/script-servo-2/.gitignore

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/.servo
2+
/.cargo/*
3+
!/.cargo/config.*
4+
/.servobuild
5+
/.wpt
6+
/.vs
7+
/android-toolchains
8+
/target
9+
/tests/wpt/reftests-report/report.html
10+
/ports/android/bin
11+
/ports/android/libs
12+
/ports/android/local.properties
13+
/ports/android/obj
14+
/python/_virtualenv*
15+
/python/tidy/servo_tidy.egg-info
16+
/tests/wpt/sync
17+
*~
18+
*.pkl
19+
*.pyc
20+
*.swp
21+
*.swo
22+
*.csv
23+
*.rej
24+
*.orig
25+
.coverage
26+
.DS_Store
27+
Servo.app
28+
.config.mk.last
29+
/glfw
30+
capture_webrender/
31+
/screenshots
32+
# Editors
33+
34+
# IntelliJ
35+
.idea
36+
*.iws
37+
*.iml
38+
39+
#Gradle
40+
.gradle
41+
42+
# VSCode
43+
.vscode
44+
!/.vscode/extensions.json
45+
46+
/unminified-js
47+
48+
# Hololens artifacts
49+
50+
support/hololens/x64/
51+
support/hololens/ARM/
52+
support/hololens/ARM64/
53+
support/hololens/ServoApp/x64/
54+
support/hololens/ServoApp/ARM/
55+
support/hololens/ServoApp/ARM64/
56+
support/hololens/ServoApp/Generated Files/
57+
support/hololens/ServoApp/BundleArtifacts/
58+
support/hololens/ServoApp/support/
59+
support/hololens/ServoApp/Debug/
60+
support/hololens/ServoApp/Release/
61+
support/hololens/packages/
62+
support/hololens/AppPackages/
63+
support/hololens/.vs/
64+
65+
# Layout debugger trace files
66+
layout_trace*

‎collector/benchmarks/script-servo-2/.hgignore

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
^\.servo
2+
^\.cargo
3+
^\.servobuild
4+
^target/
5+
^ports/android/bin
6+
^ports/android/libs
7+
^ports/android/local.properties
8+
^ports/android/obj
9+
^python/_virtualenv
10+
^python/tidy/servo_tidy\.egg-info
11+
~$
12+
\.pkl$
13+
\.pyc$
14+
\.swp$
15+
\.swo$
16+
\.csv$
17+
18+
\.DS_Store$
19+
Servo\.app/
20+
\.config\.mk\.last$
21+
/glfw
22+
23+
# Editors
24+
25+
# IntelliJ
26+
\.idea
27+
\.iws$
28+
29+
# VSCode
30+
\.vscode

0 commit comments

Comments
 (0)