Skip to content

Add x86-64-v4 support #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Headcrabed wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add x86-64-v4 support #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/llvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ on:
- 32bit
- 64bit
- 64bit-v3
- 64bit-v4
- aarch64
- all-64bit
- all
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/mpv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- 32bit
- 64bit
- 64bit-v3
- 64bit-v4
- aarch64
- all-64bit
- all
Expand Down Expand Up @@ -90,17 +91,20 @@ jobs:
case "64bit-v3":
matrix.bit = ["64-v3"];
break;
case "64bit-v4":
matrix.bit = ["64-v4"];
break;
case "aarch64":
matrix.bit = ["aarch64"];
break;
case "all-64bit":
matrix.bit = ["64","64-v3","aarch64"];
matrix.bit = ["64","64-v3","64-v4","aarch64"];
break;
case "all":
matrix.bit = ["32","64","64-v3","aarch64"];
matrix.bit = ["32","64","64-v3","64-v4","aarch64"];
break;
default:
matrix.bit = ["64","64-v3","aarch64"];
matrix.bit = ["64","64-v3","64-v4","aarch64"];
break;
}
core.setOutput("matrix_bit",JSON.stringify(matrix));
Expand Down Expand Up @@ -361,6 +365,10 @@ jobs:
arch="x86_64"
gcc_arch=-DGCC_ARCH=x86-64-v3
x86_64_level=-v3
elif [ $bit == "64-v4" ]; then
arch="x86_64"
gcc_arch=-DGCC_ARCH=x86-64-v4
x86_64_level=-v4
elif [ $bit == "aarch64" ]; then
arch="aarch64"
fi
Expand Down Expand Up @@ -423,6 +431,9 @@ jobs:
case "64-v3":
arch = "x86_64-v3";
break;
case "64-v4":
arch = "x86_64-v4";
break;
case "aarch64":
arch = "aarch64";
break;
Expand Down Expand Up @@ -668,6 +679,7 @@ jobs:
"i686": "for 32 bit system",
"x86_64": "for 64 bit system",
"x86_64-v3": "for 64 bit system with cpu not older than Intel Haswell or AMD Excavator",
"x86_64-v4": "for 64 bit system with AVX-512(AMD Zen4+ or Intel Skylake-X/Ice Lake/Tiger Lake/Rocket Lake)",
"aarch64": "for ARM64(aarch64)"
}
async function getTips(arch){
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- 32bit
- 64bit
- 64bit-v3
- 64bit-v4
- aarch64
- all-64bit
- all
Expand Down Expand Up @@ -67,17 +68,20 @@ jobs:
case "64bit-v3":
matrix.bit = ["64-v3"];
break;
case "64bit-v4":
matrix.bit = ["64-v4"];
break;
case "aarch64":
matrix.bit = ["aarch64"];
break;
case "all-64bit":
matrix.bit = ["64","64-v3","aarch64"];
matrix.bit = ["64","64-v3","64-v4","aarch64"];
break;
case "all":
matrix.bit = ["32","64","64-v3","aarch64"];
matrix.bit = ["32","64","64-v3","64-v4","aarch64"];
break;
default:
matrix.bit = ["64","64-v3","aarch64"];
matrix.bit = ["64","64-v3","64-v4","aarch64"];
break;
}
core.setOutput("matrix",JSON.stringify(matrix));
Expand Down Expand Up @@ -228,7 +232,7 @@ jobs:
script: |
let build_target=new Set();
const release = ${{ inputs.release }};
const targets = {"build64-v3":"64bit-v3","build64":"64bit","build32":"32bit","buildaarch64":"aarch64"}
const targets = {"build64-v3":"64bit-v3","build64-v4":"64bit-v4","build64":"64bit","build32":"32bit","buildaarch64":"aarch64"}
const repo="${{github.repository}}".split('/')[1];
const cache_suffix="${{ needs.params.outputs.cache_suffix }}";
const cache = await github.rest.actions.getActionsCacheList({
Expand All @@ -252,8 +256,9 @@ jobs:
}
}
if(build_target.size>0){
if(build_target.has("64bit-v3") && build_target.has("64bit") && build_target.has("aarch64")) {
if(build_target.has("64bit-v3") && build_target.has("64bit-v4") && build_target.has("64bit") && build_target.has("aarch64")) {
build_target.delete("64bit-v3");
build_target.delete("64bit-v4");
build_target.delete("64bit");
build_target.delete("aarch64");
build_target.add("all-64bit");
Expand Down
4 changes: 4 additions & 0 deletions action/build_toolchain/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ runs:
arch="x86_64"
gcc_arch=-DGCC_ARCH=x86-64-v3
x86_64_level=-v3
elif [ $bit == "64-v4" ]; then
arch="x86_64"
gcc_arch=-DGCC_ARCH=x86-64-v4
x86_64_level=-v4
elif [ $bit == "aarch64" ]; then
arch="aarch64"
fi
Expand Down
8 changes: 8 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,20 @@ main() {
package "64"
elif [ "$target" == "64-v3" ]; then
package "64-v3"
elif [ "$target" == "64-v4" ]; then
package "64-v4"
elif [ "$target" == "aarch64" ]; then
package "aarch64"
elif [ "$target" == "all-64" ]; then
package "64"
package "64-v3"
package "64-v4"
package "aarch64"
else [ "$target" == "all" ];
package "32"
package "64"
package "64-v3"
package "64-v4"
package "aarch64"
fi
rm -rf ./release/mpv-packaging-master
Expand All @@ -42,6 +46,10 @@ package() {
local arch="x86_64"
local gcc_arch="-DGCC_ARCH=x86-64-v3"
local x86_64_level="-v3"
elif [ $bit == "64-v4" ]; then
local arch="x86_64"
local gcc_arch="-DGCC_ARCH=x86-64-v4"
local x86_64_level="-v4"
elif [ $bit == "aarch64" ]; then
local arch="aarch64"
fi
Expand Down