onsuccess: #351: 1: [TCWG CI] https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/

Results :
  | # reset_artifacts:
  | -10
  | # build_aosp_toolchain:
  | -3
  | # build_shadow_llvm:
  | -2
  | # build_aosp:
  | -1
  | # shadow build has no errors
  | 0
  | # shadow.size present
  | 1

check_regression status : 0

17 files changed, 219 insertions, 220 deletions

diff --git a/01-reset_artifacts/console.log.xz b/01-reset_artifacts/console.log.xz
index 914ebe1..e8a0e65 100644
--- a/01-reset_artifacts/console.log.xz
+++ b/01-reset_artifacts/console.log.xz
diff --git a/02-build_aosp_toolchain/console.log.xz b/02-build_aosp_toolchain/console.log.xz
index fc36514..4f5d131 100644
--- a/02-build_aosp_toolchain/console.log.xz
+++ b/02-build_aosp_toolchain/console.log.xz
diff --git a/03-build_shadow_llvm/console.log.xz b/03-build_shadow_llvm/console.log.xz
index b695ae4..28efbe2 100644
--- a/03-build_shadow_llvm/console.log.xz
+++ b/03-build_shadow_llvm/console.log.xz
diff --git a/04-build_aosp/console.log.xz b/04-build_aosp/console.log.xz
index 1a38886..fbeb781 100644
--- a/04-build_aosp/console.log.xz
+++ b/04-build_aosp/console.log.xz
diff --git a/06-check_regression/console.log.xz b/06-check_regression/console.log.xz
index 7f4d150..a798147 100644
--- a/06-check_regression/console.log.xz
+++ b/06-check_regression/console.log.xz
diff --git a/git/toolchain_superproject_rev b/git/toolchain_superproject_rev
index 8c41e17..80d85e6 100644
--- a/git/toolchain_superproject_rev
+++ b/git/toolchain_superproject_rev
@@ -1 +1 @@
-ae54ee9b3c4f098c2945a886b3089a219c99e88e
+f5e7216e322d18dc82a56b8a4cf572a2b973146d
diff --git a/jenkins/build-name b/jenkins/build-name
index 01b4cb2..9923270 100644
--- a/jenkins/build-name
+++ b/jenkins/build-name
@@ -1 +1 @@
-#346-llvm-R1
+#351-toolchain_superproject-R1
diff --git a/jenkins/notify-full.log b/jenkins/notify-full.log
index 201858f..b51564b 100644
--- a/jenkins/notify-full.log
+++ b/jenkins/notify-full.log
@@ -1,25 +1,25 @@
 ++ pwd
 ++ cat
-+ remote_exec build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725: ./jenkins-scripts/round-robin-notify.sh '@@rr[top_artifacts]' artifacts __TCWG_JIRA_TOKEN ijQW9spm0p7HwZnUtLFx7CCA __stage full __verbose true
++ remote_exec build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758: ./jenkins-scripts/round-robin-notify.sh '@@rr[top_artifacts]' artifacts __TCWG_JIRA_TOKEN ijQW9spm0p7HwZnUtLFx7CCA __stage full __verbose true
 + set -euf -o pipefail
 + local host
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -d: -f 1
 + host=build-04.tcwglab
 + local port
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 2
 + port=
 + local dir
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 3
 + dir=/home/tcwg-buildslave/workspace/tcwg_aosp_1
 + local opts
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 4
-+ opts=-p50725
++ opts=-p50758
 + local env_vars
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 5
 + env_vars=
 + shift
@@ -53,7 +53,7 @@
 + cmd+=("$(printf '%q' "$i")")
 ++ printf %q true
 ++ printf %q /home/tcwg-buildslave/workspace/tcwg_aosp_1
-+ ssh -p50725 build-04.tcwglab 'cd /home/tcwg-buildslave/workspace/tcwg_aosp_1 && exec ./jenkins-scripts/round-robin-notify.sh @@rr\[top_artifacts\] artifacts __TCWG_JIRA_TOKEN ijQW9spm0p7HwZnUtLFx7CCA __stage full __verbose true'
++ ssh -p50758 build-04.tcwglab 'cd /home/tcwg-buildslave/workspace/tcwg_aosp_1 && exec ./jenkins-scripts/round-robin-notify.sh @@rr\[top_artifacts\] artifacts __TCWG_JIRA_TOKEN ijQW9spm0p7HwZnUtLFx7CCA __stage full __verbose true'
 
 /home/tcwg-buildslave/workspace/tcwg_aosp_1/jenkins-scripts/round-robin-notify.sh @@rr[top_artifacts] artifacts __TCWG_JIRA_TOKEN ijQW9spm0p7HwZnUtLFx7CCA __stage full __verbose true
 
@@ -81,17 +81,17 @@
 ++ get_baseline_manifest BUILD_URL
 ++ get_manifest base-artifacts/manifest.sh BUILD_URL false
 ++ set +x
-#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/341/
+#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/
 #   Using dir : base-artifacts
-+ echo '#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/341/'
++ echo '#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/'
 + echo '#   Using dir : base-artifacts'
 ++ get_current_manifest BUILD_URL
 ++ get_manifest artifacts/manifest.sh BUILD_URL
 ++ set +x
-#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/
+#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/
 #   Using dir : artifacts
 
-+ echo '#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/'
++ echo '#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/'
 + echo '#   Using dir : artifacts'
 + echo ''
 + mkdir -p artifacts/notify
@@ -115,96 +115,96 @@
 +++ for c in ${rr[components]}
 +++ '[' xbaseline '!=' xbaseline ']'
 +++ for c in ${rr[components]}
-+++ '[' xhttps://github.com/llvm/llvm-project.git#main '!=' xbaseline ']'
-+++ echo -ne llvm
-+++ delim=' '
-+++ for c in ${rr[components]}
 +++ '[' xbaseline '!=' xbaseline ']'
++++ for c in ${rr[components]}
++++ '[' xhttps://android.googlesource.com/platform/superproject#llvm-toolchain '!=' xbaseline ']'
++++ echo -ne toolchain_superproject
++++ delim=' '
 +++ echo
 ++ for c in $(print_updated_components)
-+++ get_current_git llvm_rev
++++ get_current_git toolchain_superproject_rev
 +++ set -euf -o pipefail
-+++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat artifacts/git/llvm_rev
-+++ get_baseline_git llvm_rev
++++ cat artifacts/git/toolchain_superproject_rev
++++ get_baseline_git toolchain_superproject_rev
 +++ set -euf -o pipefail
 +++ local base_artifacts=base-artifacts
-+++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat base-artifacts/git/llvm_rev
-++ '[' x6664e80ace0845d34eecebe0d5da0b576cde39ef '!=' x5f276d3d3360af72d4c2deafe2844f164cacbe7e ']'
-++ echo -ne llvm
++++ cat base-artifacts/git/toolchain_superproject_rev
+++ '[' xf5e7216e322d18dc82a56b8a4cf572a2b973146d '!=' xae54ee9b3c4f098c2945a886b3089a219c99e88e ']'
+++ echo -ne toolchain_superproject
 ++ delim=' '
 ++ echo
 + local c base_rev cur_rev c_commits
 + '[' 1 = 0 ']'
 + '[' 1 = 1 ']'
-+ changed_single_component=llvm
-++ get_current_git llvm_rev
++ changed_single_component=toolchain_superproject
+++ get_current_git toolchain_superproject_rev
 ++ set -euf -o pipefail
-++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat artifacts/git/llvm_rev
-+ first_bad=6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ get_baseline_git llvm_rev
+++ cat artifacts/git/toolchain_superproject_rev
++ first_bad=f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ get_baseline_git toolchain_superproject_rev
 ++ set -euf -o pipefail
 ++ local base_artifacts=base-artifacts
-++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat base-artifacts/git/llvm_rev
-+ last_good=5f276d3d3360af72d4c2deafe2844f164cacbe7e
+++ cat base-artifacts/git/toolchain_superproject_rev
++ last_good=ae54ee9b3c4f098c2945a886b3089a219c99e88e
 + local res
 + res=0
-+ wait 32084
-+ git -C llvm rev-parse --verify HEAD
-+ assert_with_msg 'Cannot parse HEAD in repo llvm' '[' 0 = 0 ']'
++ wait 1497
++ git -C toolchain_superproject rev-parse --verify HEAD
++ assert_with_msg 'Cannot parse HEAD in repo toolchain_superproject' '[' 0 = 0 ']'
 + set -euf -o pipefail +x
-+ single_commit_p llvm
++ single_commit_p toolchain_superproject
 + set -euf -o pipefail
-+ local c=llvm
++ local c=toolchain_superproject
 + local base_rev cur_rev sha1
-++ get_baseline_git llvm_rev
+++ get_baseline_git toolchain_superproject_rev
 ++ set -euf -o pipefail
 ++ local base_artifacts=base-artifacts
-++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat base-artifacts/git/llvm_rev
-+ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-++ get_current_git llvm_rev
+++ cat base-artifacts/git/toolchain_superproject_rev
++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
+++ get_current_git toolchain_superproject_rev
 ++ set -euf -o pipefail
-++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat artifacts/git/llvm_rev
-+ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ git -C llvm rev-parse '6664e80ace0845d34eecebe0d5da0b576cde39ef^@'
-# Debug traces :
-#   change_kind=single_component : llvm
-#   rev for llvm : 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef (205 commits)
-
+++ cat artifacts/git/toolchain_superproject_rev
++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ git -C toolchain_superproject rev-parse 'f5e7216e322d18dc82a56b8a4cf572a2b973146d^@'
 + for sha1 in $(git -C "$c" rev-parse "$cur_rev^@")
-+ '[' e698695fbbf62e6676f8907665187f2d2c4d814b = 5f276d3d3360af72d4c2deafe2844f164cacbe7e ']'
++ '[' 45a093c0fc219ed3c13961d9b94c103342d26efd = ae54ee9b3c4f098c2945a886b3089a219c99e88e ']'
 + return 1
+# Debug traces :
+#   change_kind=single_component : toolchain_superproject
 + change_kind=single_component
 + echo '# Debug traces :'
-+ echo '#   change_kind=single_component : llvm'
++ echo '#   change_kind=single_component : toolchain_superproject'
 + for c in "${changed_components[@]}"
-++ get_baseline_git llvm_rev
+++ get_baseline_git toolchain_superproject_rev
 ++ set -euf -o pipefail
 ++ local base_artifacts=base-artifacts
-++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat base-artifacts/git/llvm_rev
-+ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-++ get_current_git llvm_rev
+++ cat base-artifacts/git/toolchain_superproject_rev
++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
+++ get_current_git toolchain_superproject_rev
 ++ set -euf -o pipefail
-++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat artifacts/git/llvm_rev
-+ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ git -C llvm rev-list --count 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef
-+ c_commits=205
-+ echo '#   rev for llvm : 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef (205 commits)'
+++ cat artifacts/git/toolchain_superproject_rev
++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ git -C toolchain_superproject rev-list --count ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d
+#   rev for toolchain_superproject : ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d (9 commits)
+
++ c_commits=9
++ echo '#   rev for toolchain_superproject : ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d (9 commits)'
 + echo ''
 + setup_stages_to_run
 + '[' ignore = onregression ']'
@@ -224,8 +224,6 @@
 + case "$ci_project" in
 # generate_extra_details
 # post_interesting_commits
-# post_interesting_commits
-# print all notification files
 + generate_extra_details
 + set -euf -o pipefail
 + echo '# generate_extra_details'
@@ -242,6 +240,8 @@
 + '[' xsingle_component '!=' xsingle_commit ']'
 + return
 + post_interesting_commits full
+# post_interesting_commits
+# print all notification files
 + set -euf -o pipefail
 + echo '# post_interesting_commits'
 + local stage=full
@@ -290,11 +290,11 @@
 ++ get_current_manifest BUILD_URL
 ++ get_manifest artifacts/manifest.sh BUILD_URL
 ++ set +x
-+ bad_artifacts_url=https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/artifact/artifacts
++ bad_artifacts_url=https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/artifact/artifacts
 ++ get_baseline_manifest BUILD_URL
 ++ get_manifest base-artifacts/manifest.sh BUILD_URL false
 ++ set +x
-+ good_artifacts_url=https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/341/artifact/artifacts
++ good_artifacts_url=https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/artifact/artifacts
 + cat
 ++ print_result --oneline
 ++ false
@@ -309,26 +309,26 @@
 ++ case "$change_kind:$print_arg" in
 ++ new_commits=0
 ++ for c in "${changed_components[@]}"
-+++ get_baseline_git llvm_rev
++++ get_baseline_git toolchain_superproject_rev
 +++ set -euf -o pipefail
 +++ local base_artifacts=base-artifacts
-+++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat base-artifacts/git/llvm_rev
-++ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-+++ get_current_git llvm_rev
++++ cat base-artifacts/git/toolchain_superproject_rev
+++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
++++ get_current_git toolchain_superproject_rev
 +++ set -euf -o pipefail
-+++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat artifacts/git/llvm_rev
-++ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-+++ git -C llvm rev-list --count 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ c_commits=205
-++ new_commits=205
-+++ echo llvm
++++ cat artifacts/git/toolchain_superproject_rev
+++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
++++ git -C toolchain_superproject rev-list --count ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ c_commits=9
+++ new_commits=9
++++ echo toolchain_superproject
 +++ tr ' ' ,
-++ components=llvm
-++ echo '205 commits in llvm'
+++ components=toolchain_superproject
+++ echo '9 commits in toolchain_superproject'
 ++ print_commits --short
 ++ sed -e 's/^/  | /'
 ++ false
@@ -337,33 +337,32 @@
 ++ case "$change_kind:$print_arg" in
 ++ new_commits=0
 ++ for c in "${changed_components[@]}"
-+++ get_baseline_git llvm_rev
++++ get_baseline_git toolchain_superproject_rev
 +++ set -euf -o pipefail
 +++ local base_artifacts=base-artifacts
-+++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat base-artifacts/git/llvm_rev
-++ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-+++ get_current_git llvm_rev
++++ cat base-artifacts/git/toolchain_superproject_rev
+++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
++++ get_current_git toolchain_superproject_rev
 +++ set -euf -o pipefail
-+++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat artifacts/git/llvm_rev
-++ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-+++ git -C llvm rev-list --count 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ c_commits=205
-++ new_commits=205
-++ echo 'llvm commits:'
-+++ git -C llvm log --pretty=oneline 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef
++++ cat artifacts/git/toolchain_superproject_rev
+++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
++++ git -C toolchain_superproject rev-list --count ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ c_commits=9
+++ new_commits=9
+++ echo 'toolchain_superproject commits:'
++++ git -C toolchain_superproject log --pretty=oneline ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d
 +++ head -n5
-+++ true
-++ echo '6664e80ace0845d34eecebe0d5da0b576cde39ef Fix integer overflow in ConcurrentHashtTableByPtr
-e698695fbbf62e6676f8907665187f2d2c4d814b Reapply: [IRGen] Emit lifetime intrinsics around temporary aggregate argument allocas
-b1d0f5f7cd8f71dc7dd1ce388aa88dfcd5d24113 [flang][openacc] Lower the bind clause on acc routine
-e2f689155150f9a60586329780cb2b90b859c029 [flang][openacc] Fix name resolution on routine bind clause
-bb5f64a6fc059fcf81b4b9ffe035f5063956ddd8 Add Requires x86 target to test due to failure in clang-armv8-quick bot'
-++ '[' 205 -gt 5 ']'
-++ echo '... and 200 more'
+++ echo 'f5e7216e322d18dc82a56b8a4cf572a2b973146d Merge "Define a python_library for the prebuilt stdlib" into main
+45a093c0fc219ed3c13961d9b94c103342d26efd Merge "Move order file files into llvm_android from pgo-profiles" into main
+b0b96e751e65b670f3763cd682a4c4f67c8fc33d Merge "[patches] Cherry pick CLS for: Fix unaligned __cfi_check" into main
+9b4eafbd765855dd002b2492d3fb8f1f4369532e Update build-tools to ab/10669575
+38208903c6811556aab2fb3dbfe099680007908a elf.h: add EM_RISCV and ELFCOMPRESS_ZLIB constants.'
+++ '[' 9 -gt 5 ']'
+++ echo '... and 4 more'
 ++ print_result --short
 ++ false
 ++ local print_arg=--short
@@ -416,37 +415,37 @@ bb5f64a6fc059fcf81b4b9ffe035f5063956ddd8 Add Requires x86 target to test due to
 ++ case "$change_kind:$print_arg" in
 ++ new_commits=0
 ++ for c in "${changed_components[@]}"
-+++ get_baseline_git llvm_rev
++++ get_baseline_git toolchain_superproject_rev
 +++ set -euf -o pipefail
 +++ local base_artifacts=base-artifacts
-+++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat base-artifacts/git/llvm_rev
-++ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-+++ get_current_git llvm_rev
++++ cat base-artifacts/git/toolchain_superproject_rev
+++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
++++ get_current_git toolchain_superproject_rev
 +++ set -euf -o pipefail
-+++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat artifacts/git/llvm_rev
-++ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-+++ git -C llvm rev-list --count 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ c_commits=205
-++ new_commits=205
-+++ echo llvm
++++ cat artifacts/git/toolchain_superproject_rev
+++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
++++ git -C toolchain_superproject rev-list --count ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ c_commits=9
+++ new_commits=9
++++ echo toolchain_superproject
 +++ tr ' ' ,
-++ components=llvm
-++ echo '205 commits in llvm'
+++ components=toolchain_superproject
+++ echo '9 commits in toolchain_superproject'
 # generate dashboard
-+ echo '[Linaro-TCWG-CI] Success after llvm commit: 205 commits in llvm'
-+ echo '# generate dashboard'
-+ generate_dashboard_squad
-+ local results_date
 # generate_dashboard_squad
 ... Skipping
 # post_dashboard_squad
 ... Skipping
 # post_to_jira
 Full stage ran successfully.
++ echo '[Linaro-TCWG-CI] Success after toolchain_superproject commit: 9 commits in toolchain_superproject'
++ echo '# generate dashboard'
++ generate_dashboard_squad
++ local results_date
 + echo '# generate_dashboard_squad'
 + false
 + echo '... Skipping'
diff --git a/jenkins/notify-init.log b/jenkins/notify-init.log
index 53cff7e..3dd1b6e 100644
--- a/jenkins/notify-init.log
+++ b/jenkins/notify-init.log
@@ -1,25 +1,25 @@
 ++ pwd
 ++ cat
-+ remote_exec build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725: ./jenkins-scripts/round-robin-notify.sh '@@rr[top_artifacts]' artifacts --notify ignore __stage init __verbose true
++ remote_exec build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758: ./jenkins-scripts/round-robin-notify.sh '@@rr[top_artifacts]' artifacts --notify ignore __stage init __verbose true
 + set -euf -o pipefail
 + local host
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -d: -f 1
 + host=build-04.tcwglab
 + local port
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 2
 + port=
 + local dir
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 3
 + dir=/home/tcwg-buildslave/workspace/tcwg_aosp_1
 + local opts
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 4
-+ opts=-p50725
++ opts=-p50758
 + local env_vars
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 5
 + env_vars=
 + shift
@@ -53,7 +53,7 @@
 + cmd+=("$(printf '%q' "$i")")
 ++ printf %q true
 ++ printf %q /home/tcwg-buildslave/workspace/tcwg_aosp_1
-+ ssh -p50725 build-04.tcwglab 'cd /home/tcwg-buildslave/workspace/tcwg_aosp_1 && exec ./jenkins-scripts/round-robin-notify.sh @@rr\[top_artifacts\] artifacts --notify ignore __stage init __verbose true'
++ ssh -p50758 build-04.tcwglab 'cd /home/tcwg-buildslave/workspace/tcwg_aosp_1 && exec ./jenkins-scripts/round-robin-notify.sh @@rr\[top_artifacts\] artifacts --notify ignore __stage init __verbose true'
 
 /home/tcwg-buildslave/workspace/tcwg_aosp_1/jenkins-scripts/round-robin-notify.sh @@rr[top_artifacts] artifacts --notify ignore __stage init __verbose true
 
@@ -81,17 +81,17 @@
 ++ get_baseline_manifest BUILD_URL
 ++ get_manifest base-artifacts/manifest.sh BUILD_URL false
 ++ set +x
-#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/341/
+#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/
 #   Using dir : base-artifacts
-+ echo '#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/341/'
++ echo '#   Baseline  : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/'
 + echo '#   Using dir : base-artifacts'
 ++ get_current_manifest BUILD_URL
 ++ get_manifest artifacts/manifest.sh BUILD_URL
 ++ set +x
-#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/
+#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/
 #   Using dir : artifacts
 
-+ echo '#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/'
++ echo '#   Artifacts : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/'
 + echo '#   Using dir : artifacts'
 + echo ''
 + mkdir -p artifacts/notify
@@ -115,96 +115,96 @@
 +++ for c in ${rr[components]}
 +++ '[' xbaseline '!=' xbaseline ']'
 +++ for c in ${rr[components]}
-+++ '[' xhttps://github.com/llvm/llvm-project.git#main '!=' xbaseline ']'
-+++ echo -ne llvm
-+++ delim=' '
-+++ for c in ${rr[components]}
 +++ '[' xbaseline '!=' xbaseline ']'
++++ for c in ${rr[components]}
++++ '[' xhttps://android.googlesource.com/platform/superproject#llvm-toolchain '!=' xbaseline ']'
++++ echo -ne toolchain_superproject
++++ delim=' '
 +++ echo
 ++ for c in $(print_updated_components)
-+++ get_current_git llvm_rev
++++ get_current_git toolchain_superproject_rev
 +++ set -euf -o pipefail
-+++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat artifacts/git/llvm_rev
-+++ get_baseline_git llvm_rev
++++ cat artifacts/git/toolchain_superproject_rev
++++ get_baseline_git toolchain_superproject_rev
 +++ set -euf -o pipefail
 +++ local base_artifacts=base-artifacts
-+++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
++++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 +++ set -euf -o pipefail +x
-+++ cat base-artifacts/git/llvm_rev
-++ '[' x6664e80ace0845d34eecebe0d5da0b576cde39ef '!=' x5f276d3d3360af72d4c2deafe2844f164cacbe7e ']'
-++ echo -ne llvm
++++ cat base-artifacts/git/toolchain_superproject_rev
+++ '[' xf5e7216e322d18dc82a56b8a4cf572a2b973146d '!=' xae54ee9b3c4f098c2945a886b3089a219c99e88e ']'
+++ echo -ne toolchain_superproject
 ++ delim=' '
 ++ echo
 + local c base_rev cur_rev c_commits
 + '[' 1 = 0 ']'
 + '[' 1 = 1 ']'
-+ changed_single_component=llvm
-++ get_current_git llvm_rev
++ changed_single_component=toolchain_superproject
+++ get_current_git toolchain_superproject_rev
 ++ set -euf -o pipefail
-++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat artifacts/git/llvm_rev
-+ first_bad=6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ get_baseline_git llvm_rev
+++ cat artifacts/git/toolchain_superproject_rev
++ first_bad=f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ get_baseline_git toolchain_superproject_rev
 ++ set -euf -o pipefail
 ++ local base_artifacts=base-artifacts
-++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat base-artifacts/git/llvm_rev
-+ last_good=5f276d3d3360af72d4c2deafe2844f164cacbe7e
+++ cat base-artifacts/git/toolchain_superproject_rev
++ last_good=ae54ee9b3c4f098c2945a886b3089a219c99e88e
 + local res
 + res=0
-+ wait 31973
-+ git -C llvm rev-parse --verify HEAD
-+ assert_with_msg 'Cannot parse HEAD in repo llvm' '[' 0 = 0 ']'
++ wait 1386
++ git -C toolchain_superproject rev-parse --verify HEAD
++ assert_with_msg 'Cannot parse HEAD in repo toolchain_superproject' '[' 0 = 0 ']'
 + set -euf -o pipefail +x
-+ single_commit_p llvm
++ single_commit_p toolchain_superproject
 + set -euf -o pipefail
-+ local c=llvm
++ local c=toolchain_superproject
 + local base_rev cur_rev sha1
-++ get_baseline_git llvm_rev
+++ get_baseline_git toolchain_superproject_rev
 ++ set -euf -o pipefail
 ++ local base_artifacts=base-artifacts
-++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat base-artifacts/git/llvm_rev
-+ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-++ get_current_git llvm_rev
+++ cat base-artifacts/git/toolchain_superproject_rev
++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
+++ get_current_git toolchain_superproject_rev
 ++ set -euf -o pipefail
-++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat artifacts/git/llvm_rev
-+ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ git -C llvm rev-parse '6664e80ace0845d34eecebe0d5da0b576cde39ef^@'
+++ cat artifacts/git/toolchain_superproject_rev
++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ git -C toolchain_superproject rev-parse 'f5e7216e322d18dc82a56b8a4cf572a2b973146d^@'
+# Debug traces :
+#   change_kind=single_component : toolchain_superproject
 + for sha1 in $(git -C "$c" rev-parse "$cur_rev^@")
-+ '[' e698695fbbf62e6676f8907665187f2d2c4d814b = 5f276d3d3360af72d4c2deafe2844f164cacbe7e ']'
++ '[' 45a093c0fc219ed3c13961d9b94c103342d26efd = ae54ee9b3c4f098c2945a886b3089a219c99e88e ']'
 + return 1
-# Debug traces :
-#   change_kind=single_component : llvm
 + change_kind=single_component
 + echo '# Debug traces :'
-+ echo '#   change_kind=single_component : llvm'
++ echo '#   change_kind=single_component : toolchain_superproject'
 + for c in "${changed_components[@]}"
-++ get_baseline_git llvm_rev
+++ get_baseline_git toolchain_superproject_rev
 ++ set -euf -o pipefail
 ++ local base_artifacts=base-artifacts
-++ assert_with_msg 'ERROR: No llvm_rev in baseline git' '[' -f base-artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in baseline git' '[' -f base-artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat base-artifacts/git/llvm_rev
-+ base_rev=5f276d3d3360af72d4c2deafe2844f164cacbe7e
-++ get_current_git llvm_rev
+++ cat base-artifacts/git/toolchain_superproject_rev
++ base_rev=ae54ee9b3c4f098c2945a886b3089a219c99e88e
+++ get_current_git toolchain_superproject_rev
 ++ set -euf -o pipefail
-++ assert_with_msg 'ERROR: No llvm_rev in current git' '[' -f artifacts/git/llvm_rev ']'
+++ assert_with_msg 'ERROR: No toolchain_superproject_rev in current git' '[' -f artifacts/git/toolchain_superproject_rev ']'
 ++ set -euf -o pipefail +x
-++ cat artifacts/git/llvm_rev
-+ cur_rev=6664e80ace0845d34eecebe0d5da0b576cde39ef
-++ git -C llvm rev-list --count 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef
-#   rev for llvm : 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef (205 commits)
+++ cat artifacts/git/toolchain_superproject_rev
++ cur_rev=f5e7216e322d18dc82a56b8a4cf572a2b973146d
+++ git -C toolchain_superproject rev-list --count ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d
+#   rev for toolchain_superproject : ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d (9 commits)
 
-+ c_commits=205
-+ echo '#   rev for llvm : 5f276d3d3360af72d4c2deafe2844f164cacbe7e..6664e80ace0845d34eecebe0d5da0b576cde39ef (205 commits)'
++ c_commits=9
++ echo '#   rev for toolchain_superproject : ae54ee9b3c4f098c2945a886b3089a219c99e88e..f5e7216e322d18dc82a56b8a4cf572a2b973146d (9 commits)'
 + echo ''
 + setup_stages_to_run
 + '[' ignore = onregression ']'
@@ -223,10 +223,9 @@
 + print_last_icommit_f=print_last_icommit
 + case "$ci_project" in
 + generate_extra_details
-+ set -euf -o pipefail
 # generate_extra_details
 # post_interesting_commits
-Init stage ran successfully.
++ set -euf -o pipefail
 + echo '# generate_extra_details'
 + post_interesting_commits init
 + set -euf -o pipefail
@@ -234,6 +233,7 @@ Init stage ran successfully.
 + local stage=init
 + '[' single_component '!=' single_commit ']'
 + return
+Init stage ran successfully.
 + '[' init '!=' full ']'
 + echo 'Init stage ran successfully.'
 + exit 0
diff --git a/jenkins/rewrite.log b/jenkins/rewrite.log
index c80ddcd..44cb5dc 100644
--- a/jenkins/rewrite.log
+++ b/jenkins/rewrite.log
@@ -1,25 +1,25 @@
 ++ pwd
 ++ cat
-+ remote_exec build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725: ./jenkins-scripts/round-robin-baseline.sh '@@rr[top_artifacts]' artifacts __build_script tcwg_aosp-build.sh __push_base_artifacts true __rewrite_base_artifacts true __rewrite_num 100
++ remote_exec build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758: ./jenkins-scripts/round-robin-baseline.sh '@@rr[top_artifacts]' artifacts __build_script tcwg_aosp-build.sh __push_base_artifacts true __rewrite_base_artifacts true __rewrite_num 100
 + set -euf -o pipefail
 + local host
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -d: -f 1
 + host=build-04.tcwglab
 + local port
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 2
 + port=
 + local dir
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 3
 + dir=/home/tcwg-buildslave/workspace/tcwg_aosp_1
 + local opts
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 4
-+ opts=-p50725
++ opts=-p50758
 + local env_vars
-++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50725:
+++ echo build-04.tcwglab::/home/tcwg-buildslave/workspace/tcwg_aosp_1:-p50758:
 ++ cut -s -d: -f 5
 + env_vars=
 + shift
@@ -59,7 +59,7 @@
 + cmd+=("$(printf '%q' "$i")")
 ++ printf %q 100
 ++ printf %q /home/tcwg-buildslave/workspace/tcwg_aosp_1
-+ ssh -p50725 build-04.tcwglab 'cd /home/tcwg-buildslave/workspace/tcwg_aosp_1 && exec ./jenkins-scripts/round-robin-baseline.sh @@rr\[top_artifacts\] artifacts __build_script tcwg_aosp-build.sh __push_base_artifacts true __rewrite_base_artifacts true __rewrite_num 100'
++ ssh -p50758 build-04.tcwglab 'cd /home/tcwg-buildslave/workspace/tcwg_aosp_1 && exec ./jenkins-scripts/round-robin-baseline.sh @@rr\[top_artifacts\] artifacts __build_script tcwg_aosp-build.sh __push_base_artifacts true __rewrite_base_artifacts true __rewrite_num 100'
 + declare -g rewrite_base_artifacts_first=true
 + true
 + update_baseline
diff --git a/jenkins/run-build.env b/jenkins/run-build.env
index 6f701ba..8139ec6 100644
--- a/jenkins/run-build.env
+++ b/jenkins/run-build.env
@@ -1,9 +1,9 @@
-build_name="#346"
+build_name="#351"
 docker_opts=(--distro 	
 default 	)
 source build_container.sh
 trap "cleanup_all_containers" EXIT
-build_name="#346-llvm"
-branch_opt=(==rr\[llvm_git\] 	
-https://github.com/llvm/llvm-project.git#main 	)
-build_name="#346-llvm-R1"
+build_name="#351-toolchain_superproject"
+branch_opt=(==rr\[toolchain_superproject_git\] 	
+https://android.googlesource.com/platform/superproject#llvm-toolchain 	)
+build_name="#351-toolchain_superproject-R1"
diff --git a/manifest.sh b/manifest.sh
index c9a51bd..861ed9d 100644
--- a/manifest.sh
+++ b/manifest.sh
@@ -1,4 +1,4 @@
-declare -g "jenkins_scripts_rev=2ec1a6363957f53f2082af20db78979f82b9ee42"
+declare -g "jenkins_scripts_rev=17a91075ac9b995fa9511fb534f17247daaa7bdd"
 # Artifacts directory
 # Recording parameters to manifest: artifacts/manifest.sh
 rr[ci_project]="tcwg_aosp-code_size-dalvikvm"
@@ -7,9 +7,9 @@ declare -g "bmk_branch=master"
 declare -g "scripts_branch=master"
 rr[mode]="build"
 rr[update_baseline]="onsuccess"
-declare -g "BUILD_URL=https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/"
+declare -g "BUILD_URL=https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/"
 declare -g "SQUAD_GRP=tcwg"
-rr[llvm_git]="https://github.com/llvm/llvm-project.git#main"
+rr[toolchain_superproject_git]="https://android.googlesource.com/platform/superproject#llvm-toolchain"
 # Saving rr[] in the manifest
 rr[abe_branch]="master"
 rr[abe_repo]="https://git-us.linaro.org/toolchain/abe.git"
@@ -19,8 +19,8 @@ rr[breakup_changed_components]="breakup_changed_components llvm"
 rr[components]="aosp_superproject llvm toolchain_superproject"
 rr[host_c++]="/usr/bin/g++"
 rr[host_cc]="/usr/bin/gcc"
+rr[llvm_git]="baseline"
 rr[no_regression_p]="no_regression_p"
 rr[no_regression_result]="0"
 rr[old_format_baseline_branch]="linaro-local/ci/tcwg_aosp-code_size-dalvikvm/oriole-master"
-rr[toolchain_superproject_git]="baseline"
 declare -g "notify=ignore"
diff --git a/notify/jira/comments.txt b/notify/jira/comments.txt
index 706d0ee..77b69aa 100644
--- a/notify/jira/comments.txt
+++ b/notify/jira/comments.txt
@@ -1,3 +1,3 @@
 [GNU-692]
 Success
-Details: https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/artifact/artifacts/notify/mail-body.txt/*view*/
+Details: https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/artifact/artifacts/notify/mail-body.txt/*view*/
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 8d196f2..c7de799 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -1,17 +1,17 @@
-[Linaro-TCWG-CI] Success after llvm commit: 205 commits in llvm
+[Linaro-TCWG-CI] Success after toolchain_superproject commit: 9 commits in toolchain_superproject
 
 Dear contributor, our automatic CI has detected problems related to your patch.
 Please find below some details about it.
 
 In CI config tcwg_aosp-code_size-dalvikvm/oriole-master after:
 
-  | llvm commits:
-  | 6664e80ace0845d34eecebe0d5da0b576cde39ef Fix integer overflow in ConcurrentHashtTableByPtr
-  | e698695fbbf62e6676f8907665187f2d2c4d814b Reapply: [IRGen] Emit lifetime intrinsics around temporary aggregate argument allocas
-  | b1d0f5f7cd8f71dc7dd1ce388aa88dfcd5d24113 [flang][openacc] Lower the bind clause on acc routine
-  | e2f689155150f9a60586329780cb2b90b859c029 [flang][openacc] Fix name resolution on routine bind clause
-  | bb5f64a6fc059fcf81b4b9ffe035f5063956ddd8 Add Requires x86 target to test due to failure in clang-armv8-quick bot
-  | ... and 200 more
+  | toolchain_superproject commits:
+  | f5e7216e322d18dc82a56b8a4cf572a2b973146d Merge "Define a python_library for the prebuilt stdlib" into main
+  | 45a093c0fc219ed3c13961d9b94c103342d26efd Merge "Move order file files into llvm_android from pgo-profiles" into main
+  | b0b96e751e65b670f3763cd682a4c4f67c8fc33d Merge "[patches] Cherry pick CLS for: Fix unaligned __cfi_check" into main
+  | 9b4eafbd765855dd002b2492d3fb8f1f4369532e Update build-tools to ab/10669575
+  | 38208903c6811556aab2fb3dbfe099680007908a elf.h: add EM_RISCV and ELFCOMPRESS_ZLIB constants.
+  | ... and 4 more
 
 Results changed to
 # reset_artifacts:
@@ -46,6 +46,6 @@ From
 -----------------8<--------------------------8<--------------------------8<--------------------------
 The information below can be used to reproduce a debug environment:
 
-Current build   : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/artifact/artifacts
-Reference build : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/341/artifact/artifacts
+Current build   : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/351/artifact/artifacts
+Reference build : https://ci.linaro.org/job/tcwg_aosp-code_size-dalvikvm--oriole-master-build/346/artifact/artifacts
 
diff --git a/notify/mail-subject.txt b/notify/mail-subject.txt
index 48c2ff3..6054544 100644
--- a/notify/mail-subject.txt
+++ b/notify/mail-subject.txt
@@ -1 +1 @@
-[Linaro-TCWG-CI] Success after llvm commit: 205 commits in llvm
+[Linaro-TCWG-CI] Success after toolchain_superproject commit: 9 commits in toolchain_superproject
diff --git a/results-vs-prev/results.csv b/results-vs-prev/results.csv
index 28a2eaa..1b7cef5 100644
--- a/results-vs-prev/results.csv
+++ b/results-vs-prev/results.csv
@@ -1,8 +1,8 @@
 benchmark,symbol,rel_size,size_x,size_y
-out/soong/.intermediates/bionic/libm/libm/android_arm64_armv8-2a_cortex-a55_shared_current/libm.so,binary,100,24046,24046
+out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-2a_cortex-a55_shared_current/libc.so,binary,100,127748,127748
 out/soong/.intermediates/bionic/libdl/libdl/android_arm64_armv8-2a_cortex-a55_shared_current/libdl.so,binary,100,1352,1352
+out/soong/.intermediates/bionic/libm/libm/android_arm64_armv8-2a_cortex-a55_shared_current/libm.so,binary,100,24046,24046
 out/soong/.intermediates/system/logging/liblog/liblog/android_arm64_armv8-2a_cortex-a55_shared_current/liblog.so,binary,100,4806,4806
-out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-2a_cortex-a55_shared_current/libc.so,binary,100,127748,127748
 out/soong/.intermediates/libnativehelper/libnativehelper/android_arm64_armv8-2a_cortex-a55_shared_apex31/unstripped/libnativehelper.so,binary,100,18353,18353
 out/soong/.intermediates/art/sigchainlib/libsigchain/android_arm64_armv8-2a_cortex-a55_shared_apex31/e4694d05f1cb76fefd10c9c37c092ec4/unstripped/libsigchain.so,binary,100,21531,21531
 out/soong/.intermediates/art/dalvikvm/dalvikvm/android_arm64_armv8-2a_cortex-a55_apex31/e4694d05f1cb76fefd10c9c37c092ec4/unstripped/dalvikvm64,binary,100,6646,6646
diff --git a/size.csv b/size.csv
index f450750..60e3a15 100644
--- a/size.csv
+++ b/size.csv
@@ -1,8 +1,8 @@
 benchmark,symbol,size
 out/soong/.intermediates/bionic/libc/libc/android_arm64_armv8-2a_cortex-a55_shared_current/libc.so,binary,127748
-out/soong/.intermediates/bionic/libdl/libdl/android_arm64_armv8-2a_cortex-a55_shared_current/libdl.so,binary,1352
 out/soong/.intermediates/bionic/libm/libm/android_arm64_armv8-2a_cortex-a55_shared_current/libm.so,binary,24046
 out/soong/.intermediates/system/logging/liblog/liblog/android_arm64_armv8-2a_cortex-a55_shared_current/liblog.so,binary,4806
+out/soong/.intermediates/bionic/libdl/libdl/android_arm64_armv8-2a_cortex-a55_shared_current/libdl.so,binary,1352
 out/soong/.intermediates/libnativehelper/libnativehelper/android_arm64_armv8-2a_cortex-a55_shared_apex31/unstripped/libnativehelper.so,binary,18353
 out/soong/.intermediates/art/sigchainlib/libsigchain/android_arm64_armv8-2a_cortex-a55_shared_apex31/e4694d05f1cb76fefd10c9c37c092ec4/unstripped/libsigchain.so,binary,21531
 out/soong/.intermediates/art/dalvikvm/dalvikvm/android_arm64_armv8-2a_cortex-a55_apex31/e4694d05f1cb76fefd10c9c37c092ec4/unstripped/dalvikvm64,binary,6646