Merge branch 'google:main' into main

Author: Tungstend

.gn

@@ -26,8 +26,8 @@ script_executable = "python3"
 # These are the list of GN files that run exec_script. This allowlist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged except for gypi_to_gn calls.
-exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
-                        build_dotfile_settings.exec_script_whitelist +
+exec_script_allowlist = angle_dotfile_settings.exec_script_allowlist +
+                        build_dotfile_settings.exec_script_allowlist +
                         [
                           "//build/config/sysroot.gni",
                           "//build/config/win/BUILD.gn",

BUILD.gn

@@ -1845,3 +1845,18 @@ group("angle_static") {
     ":translator",
   ]
 }
+
+# GN evaluates each .gn file once per toolchain, so restricting to default
+# toolchain will ensure write_file() is called only once.
+if (!build_with_chromium && angle_has_build &&
+    current_toolchain == default_toolchain) {
+  import("//build/gn_logs.gni")
+
+  # Write debug logs to gn_logs.txt.
+  _lines = [
+             "Generated during 'gn gen' by //BUILD.gn.",
+             "",
+           ] + build_gn_logs
+
+  write_file("$root_build_dir/gn_logs.txt", _lines)
+}

DEPS

@@ -2,7 +2,7 @@ Name: ANGLE
 URL: http://angleproject.org
 Version: N/A
 Revision: DEPS
-License: BSD
+License: BSD-3-Clause
 License File: LICENSE
 Security Critical: yes
 Shipped: yes

README.chromium

@@ -0,0 +1,52 @@
+# Becoming a committer
+
+Committers are people that are considered to have write access to the ANGLE repository.
+All CLs submitted to the ANGLE repository need to be reviewed by one or (for non-trivial ones) two committers.
+In addition to this requirement, all CLs must also be reviewed or authored by an OWNER of the changed files.
+
+This privilege is granted with some expectation of responsibility: committers are people who care about the ANGLE project and want to help it meet its goals.
+A committer is not just someone who can make changes, but someone who has demonstrated their ability to collaborate with the team, get the most knowledgeable people to review code, contribute high-quality code, and follow through to fix issues (in code or tests).
+
+A committer is a contributor to the ANGLE project's success and a citizen helping the projects succeed.
+
+## How to become a committer?
+
+_Note to Googlers: the process is a bit different for ANGLE team members, reach out to an @google.com top-level OWNER directly._
+
+In a nutshell, contribute 20 non-trivial patches and get at least three different people to review them (you'll need three people to support you).
+Then ask someone to nominate you.
+You're demonstrating your:
+
+*   commitment to the project (20 good patches requires a lot of your valuable time),
+*   ability to collaborate with the team,
+*   understanding of how the team works (policies, processes for testing and code review, etc),
+*   understanding of the projects' code base and coding style, and
+*   ability to write good code (last but certainly not least)
+
+A current committer nominates you by sending email to one of the top-level OWNERs containing:
+
+*   your first and last name
+*   your email address in Gerrit
+*   an explanation of why you should be a committer,
+*   embedded list of links to revisions (about top 10) containing your patches
+
+Top-level OWNERs will deliberate and come to a consensus, targeting to reach it in 5 working days.
+Once you get approval, you are granted additional CR+2 review permissions.
+In some cases the process could drag out slightly.
+Ping OWNERs and keep writing patches!
+Even in the rare cases where a nomination fails, the objection is usually something easy to address like “more patches” or “not enough people are familiar with this person’s work.”
+
+## Maintaining committer status
+
+You don't really need to do much to maintain committer status: just keep being awesome and helping the ANGLE project!
+
+In the unhappy event that a committer continues to disregard good citizenship (or actively disrupts the project), we may need to revoke that person's status.
+The process is the same as for nominating a new committer: someone suggests the revocation with a good reason and OWNERs deliberate.
+We hope that's simple enough, and that we never have to test it in practice.
+
+In addition, as a security measure, if you are inactive on Gerrit (no upload, no comment and no review) for more than a year, we may revoke your committer privileges.
+An email notification is sent about 7 days prior to the removal.
+This is not meant as a punishment, so if you wish to resume contributing after that, contact top level OWNERs to ask that it be restored, and we will normally do so.
+
+(This document was inspired by [https://v8.dev/docs/become-committer](https://v8.dev/docs/become-committer) itself inspired by its Chromium equivalent)
+

build

@@ -247,9 +247,7 @@ RELAND** button.
 
 Similar to [Chromium's committer status][Committer-status], long-term contributors to the ANGLE
 project may request to join the `angle-committers` group.  This allows you to give `+2` on code
-reviews and land patches without assistance.  After about 6 months of regular contributions, you may
-request committer status from a core ANGLE team member via email or code review.  Chromium
-committers and Googlers may ask at any time.
+reviews and land patches without assistance.  See [Becoming a Committer](BecomingCommitter.md).
 
 ### OWNERS files and becoming an Owner
 

buildtools

@@ -111,12 +111,14 @@ On desktop:
 ```
 ANGLE_GL_VENDOR="foo"
 ANGLE_GL_RENDERER="bar"
+ANGLE_GL_VERSION="blee"
 ```
 
 On Android:
 ```
 adb shell setprop debug.angle.gl_vendor "foo"
 adb shell setprop debug.angle.gl_renderer "bar"
+adb shell setprop debug.angle.gl_version "blee"
 ```
 
 ## Enabling Debug-Utils Markers

doc/BecomingCommitter.md

@@ -0,0 +1,92 @@
+# ANGLE Standalone Benchmark
+
+This option builds the trace tests apk to run the selected traces from restricted traces in "src/tests/restricted_traces/". Running traces this way won't require additional trace data setup. Simply clicking on the apk or running the app activity will run the traces. Additionally, it will also dump the fps values of the traces it runs and also the histogram of the diff of the screenshot of the KeyFrame of the trace if golden images are provided.
+
+Setup is similar to ANGLE Restricted Traces and requires some additional GN args.
+
+## Accessing the traces
+
+Follow the `Accessing the traces` in [restricted_traces/README.md](../src/tests/restricted_traces/README.md#accessing-the-traces) and then return here.
+
+## Building the Standalone Benchmark apk
+
+This option is available only for Android. Follow the steps in [DevSetupAndroid.md](DevSetupAndroid.md) (Recommend using the [`Performance`](DevSetupAndroid.md#performance-config) arguments for best performance)
+
+When that is working, add the following GN arg to your setup:
+```
+build_angle_trace_perf_tests = true
+```
+### Selecting which traces to build
+
+Since the traces are numerous and trace data is huge in size, you should limit the compilation to a subset to keep the apk file size within limits.
+```
+angle_restricted_traces = ["pokemon_go 5", "car_chase 1"]
+angle_standalone_benchmark_traces = ["pokemon_go", "car_chase"]
+angle_standalone_benchmark_goldens_dir = "<Path to golden images of the traces if present>"
+```
+
+Names of the png files of golden images should match \<trace name\>_golden.png
+
+To build the apk:
+```
+autoninja -C out/<config> angle_trace_tests
+```
+
+## Installing the apk
+```
+adb install out/<config>/angle_trace_tests_apk/angle_trace_tests-debug.apk
+```
+
+### Set permissions for the app
+To allow the results to be available in the external storage, we need to provide appropriate permission.
+```
+adb shell "appops set com.android.angle.test MANAGE_EXTERNAL_STORAGE allow || true"
+```
+
+## Running the apk
+You can run the app either by clicking on the "ANGLEBench" app icon or by running the following command (after unlocking the phone).
+
+Note: It is important to unlock the device before running the adb command.
+```
+adb shell am start -n com.android.angle.test/com.android.angle.test.StandaloneBenchmarkActivity
+```
+
+## Run configs
+Below configs for the trace runs are set to hardcoded values
+```
+        gVerboseLogging  = true;
+        gScreenshotDir   = "<Application_Dir>/files";
+        gSaveScreenshots = true;
+        gUseANGLE        = "vulkan";
+```
+
+However, other configs can be set using `org.chromium.native_test.NativeTest.CommandLineFlags`. Example:
+```
+adb shell am start -n com.android.angle.test/com.android.angle.test.StandaloneBenchmarkActivity -e org.chromium.native_test.NativeTest.CommandLineFlags '--trials=1\ --trial-time=60'
+```
+
+## Results
+Once all the traces listed in `angle_standalone_benchmark_traces` are finished, the app will generate `traces_fps.txt`.
+
+If `angle_standalone_benchmark_goldens_dir` is specified in the GN args, it will also generate `traces_img_comp.txt`.
+
+Output files will be placed on the device in `chromium_tests_root` dir in external storage. For example: `/sdcard/chromium_tests_root/`
+
+### traces_fps.txt
+```
+<trace 1 name> <FPS value>
+<trace 2 name> <FPS value>
+...
+```
+
+### traces_img_comp.txt
+```
+<trace 1 name>:
+Diff in pixel value:    0-20, 20-40, 40-70, 70-100, 100-150, 150-255
+Number of pixels:       <#>, <#>, <#>, <#>, <#>, <#>,
+
+<trace 2 name>:
+Diff in pixel value:    0-20, 20-40, 40-70, 70-100, 100-150, 150-255
+Number of pixels:       <#>, <#>, <#>, <#>, <#>, <#>,
+...
+```