third_party: Create scripts for updating spirv-[tools|headers]
Bug: None
Change-Id: I8a2a39894f022d93ad159fbfd20e34fbc06fa73d
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43050
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Ben Clayton <bclayton@google.com>
diff --git a/third_party/update-marl.sh b/third_party/update-marl.sh
index 0750b9a..41dc656 100755
--- a/third_party/update-marl.sh
+++ b/third_party/update-marl.sh
@@ -13,5 +13,5 @@
ALL_CHANGES=`git log -n 1 HEAD^2 | egrep '^(\s{4}[0-9a-f]{9}\s*.*)$'`
HEAD_CHANGE=`echo "$ALL_CHANGES" | egrep '[0-9a-f]{9}' -o -m 1`
-LOG_MSG=`echo -e "Update Marl to $HEAD_CHANGE\n${REASON}\nChanges:\n$ALL_CHANGES\n\nCommands:\n git subtree pull --prefix third_party/marl https://github.com/google/marl master --squash\n\nBug: b/140546382"`
-git commit --amend -m "$LOG_MSG"
\ No newline at end of file
+LOG_MSG=`echo -e "Update Marl to $HEAD_CHANGE\n${REASON}\nChanges:\n$ALL_CHANGES\n\nCommands:\n ./third_party/update-marl.sh --squash\n\nBug: b/140546382"`
+git commit --amend -m "$LOG_MSG"
diff --git a/third_party/update-spirvheaders.sh b/third_party/update-spirvheaders.sh
new file mode 100755
index 0000000..fc6c548
--- /dev/null
+++ b/third_party/update-spirvheaders.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# update-spirvheaderss merges the latest changes from
+# the github.com/KhronosGroup/SPIRV-Headers into third_party/SPIRV-Headers.
+# This script copies the change descriptions from the squash change into the
+# top merge change, along with a standardized description.
+REASON=$1
+
+if [ ! -z "$REASON" ]; then
+ REASON="\n$REASON\n"
+fi
+
+git subtree pull --prefix third_party/SPIRV-Headers https://github.com/KhronosGroup/SPIRV-Headers master --squash -m "Update SPIR-V Headers"
+
+ALL_CHANGES=`git log -n 1 HEAD^2 | egrep '^(\s{4}[0-9a-f]{9}\s*.*)$'`
+HEAD_CHANGE=`echo "$ALL_CHANGES" | egrep '[0-9a-f]{9}' -o -m 1`
+LOG_MSG=`echo -e "Update SPIR-V Headers to $HEAD_CHANGE\n${REASON}\nChanges:\n$ALL_CHANGES\n\nCommands:\n ./third_party/update-spirvheaders.sh \n\nBug: b/123642959"`
+git commit --amend -m "$LOG_MSG"
diff --git a/third_party/update-spirvtools.sh b/third_party/update-spirvtools.sh
new file mode 100755
index 0000000..ea3c22e
--- /dev/null
+++ b/third_party/update-spirvtools.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# update-spirvtools merges the latest changes from
+# the github.com/KhronosGroup/SPIRV-Tools into third_party/SPIRV-Tools.
+# This script copies the change descriptions from the squash change into the
+# top merge change, along with a standardized description.
+REASON=$1
+
+if [ ! -z "$REASON" ]; then
+ REASON="\n$REASON\n"
+fi
+
+THIRD_PARTY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
+
+GIT_RESULT=`git subtree pull --prefix third_party/SPIRV-Tools https://github.com/KhronosGroup/SPIRV-Tools master --squash -m "Update SPIR-V Tools"`
+if [[ $GIT_RESULT == *"CONFLICT"* ]]; then
+ echo "subtree pull resulted in conflicts. Atempting to automatically resolve..."
+ # CONFLICT is very likely due to Android.mk being deleted in our third_party.
+ # Delete it, and try to continue.
+ git rm ${THIRD_PARTY_DIR}/SPIRV-Tools/Android.mk
+ git -c core.editor=true merge --continue # '-c core.editor=true' prevents the editor from showing
+ if [ $? -ne 0 ]; then
+ echo "Could not automatically resolve conflicts."
+ exit 1
+ fi
+fi
+
+
+ALL_CHANGES=`git log -n 1 HEAD^2 | egrep '^(\s{4}[0-9a-f]{9}\s*.*)$'`
+HEAD_CHANGE=`echo "$ALL_CHANGES" | egrep '[0-9a-f]{9}' -o -m 1`
+LOG_MSG=`echo -e "Update SPIR-V Tools to $HEAD_CHANGE\n${REASON}\nChanges:\n$ALL_CHANGES\n\nCommands:\n ./third_party/update-spirvtools.sh\n\nBug: b/123642959"`
+git commit --amend -m "$LOG_MSG"
