Skip to content

Commit 1922f87

Browse files
snapdragon: add missing features to WoS scripts to achieve parity with ADB scripts (#20884)
* Add missing features to WoS scripts to achieve parity with ADB scripts * Fix line-ending in run-mtmd.ps1 Signed-off-by: Max Krasnyansky <maxk@qti.qualcomm.com> --------- Signed-off-by: Max Krasnyansky <maxk@qti.qualcomm.com> Co-authored-by: Max Krasnyansky <maxk@qti.qualcomm.com>
1 parent 345de3c commit 1922f87

5 files changed

Lines changed: 100 additions & 2 deletions

File tree

scripts/snapdragon/windows/run-bench.ps1

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ if ($null -ne $env:V) {
2020
$env:GGML_HEXAGON_VERBOSE=$env:V
2121
}
2222

23+
if ($null -ne $env:E) {
24+
$env:GGML_HEXAGON_EXPERIMENTAL=$env:E
25+
}
26+
27+
if ($null -ne $env:PROF) {
28+
$env:GGML_HEXAGON_PROFILE=$env:PROF; $env:GGML_HEXAGON_OPSYNC=1
29+
}
30+
2331
if ($null -ne $env:OPMASK) {
2432
$env:GGML_HEXAGON_OPMASK=$env:OPMASK
2533
}
@@ -32,6 +40,10 @@ if ($null -ne $env:NDEV) {
3240
$env:GGML_HEXAGON_NDEV=$env:NDEV
3341
}
3442

43+
if ($null -ne $env:HB) {
44+
$env:GGML_HEXAGON_HOSTBUF=$env:HB
45+
}
46+
3547
$env:ADSP_LIBRARY_PATH="$basedir\lib"
3648

3749
& "$basedir\bin\llama-bench.exe" `

scripts/snapdragon/windows/run-cli.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@ if ($null -ne $env:NDEV) {
4444
$env:GGML_HEXAGON_NDEV=$env:NDEV
4545
}
4646

47+
if ($null -ne $env:HB) {
48+
$env:GGML_HEXAGON_HOSTBUF=$env:HB
49+
}
50+
4751
$env:ADSP_LIBRARY_PATH="$basedir\lib"
4852

4953
& "$basedir\bin\llama-cli.exe" `
5054
--no-mmap -m $basedir\..\..\gguf\$model `
5155
--poll 1000 -t 6 --cpu-mask 0xfc --cpu-strict 1 `
52-
--ctx-size 8192 --ubatch-size 128 -fa on `
56+
--ctx-size 8192 --ubatch-size 256 -fa on `
5357
-ngl 99 --device $device $cli_opts

scripts/snapdragon/windows/run-completion.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@ if ($null -ne $env:NDEV) {
4444
$env:GGML_HEXAGON_NDEV=$env:NDEV
4545
}
4646

47+
if ($null -ne $env:HB) {
48+
$env:GGML_HEXAGON_HOSTBUF=$env:HB
49+
}
50+
4751
$env:ADSP_LIBRARY_PATH="$basedir\lib"
4852

4953
& "$basedir\bin\llama-completion.exe" `
5054
--no-mmap -m $basedir\..\..\gguf\$model `
5155
--poll 1000 -t 6 --cpu-mask 0xfc --cpu-strict 1 `
52-
--ctx-size 8192 --batch-size 128 -fa on `
56+
--ctx-size 8192 --batch-size 256 -fa on `
5357
-ngl 99 -no-cnv --device $device $cli_opts
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#!/usr/bin/env pwsh
2+
3+
# Basedir on device
4+
$basedir=".\pkg-snapdragon"
5+
6+
$cli_opts=$args
7+
8+
$model="gemma-3-4b-it-Q4_0.gguf"
9+
if ($null -ne $env:M) {
10+
$model=$env:M
11+
}
12+
13+
$mmproj="mmproj-F16.gguf"
14+
if ($null -ne $env:MMPROJ) {
15+
$mmproj=$env:MMPROJ
16+
}
17+
18+
$image=""
19+
if ($null -ne $env:IMG) {
20+
$image=$env:IMG
21+
}
22+
23+
$device="HTP0"
24+
if ($null -ne $env:D) {
25+
$device=$env:D
26+
}
27+
28+
if ($null -ne $env:V) {
29+
$env:GGML_HEXAGON_VERBOSE=$env:V
30+
}
31+
32+
# Default experimental to 1
33+
$env:GGML_HEXAGON_EXPERIMENTAL=1
34+
if ($null -ne $env:E) {
35+
$env:GGML_HEXAGON_EXPERIMENTAL=$env:E
36+
}
37+
38+
if ($null -ne $env:SCHED) {
39+
$env:GGML_SCHED_DEBUG=$env:SCHED; $cli_opts="$cli_opts -v"
40+
}
41+
42+
if ($null -ne $env:PROF) {
43+
$env:GGML_HEXAGON_PROFILE=$env:PROF; $env:GGML_HEXAGON_OPSYNC=1
44+
}
45+
46+
if ($null -ne $env:OPMASK) {
47+
$env:GGML_HEXAGON_OPMASK=$env:OPMASK
48+
}
49+
50+
if ($null -ne $env:NHVX) {
51+
$env:GGML_HEXAGON_NHVX=$env:NHVX
52+
}
53+
54+
if ($null -ne $env:NDEV) {
55+
$env:GGML_HEXAGON_NDEV=$env:NDEV
56+
}
57+
58+
if ($null -ne $env:HB) {
59+
$env:GGML_HEXAGON_HOSTBUF=$env:HB
60+
}
61+
62+
if ($null -ne $env:MTMD_DEVICE) {
63+
$env:MTMD_BACKEND_DEVICE=$env:MTMD_DEVICE
64+
}
65+
66+
$env:ADSP_LIBRARY_PATH="$basedir\lib"
67+
68+
& "$basedir\bin\llama-mtmd-cli.exe" `
69+
--no-mmap -m $basedir\..\..\gguf\$model `
70+
--mmproj $basedir\..\..\gguf\$mmproj `
71+
--image $basedir\..\..\gguf\$image `
72+
--poll 1000 -t 6 --cpu-mask 0xfc --cpu-strict 1 `
73+
--ctx-size 8192 --ubatch-size 256 -fa on `
74+
-ngl 99 --device $device -v $cli_opts

scripts/snapdragon/windows/run-tool.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ if ($null -ne $env:NDEV) {
5050
$env:GGML_HEXAGON_NDEV=$env:NDEV
5151
}
5252

53+
if ($null -ne $env:HB) {
54+
$env:GGML_HEXAGON_HOSTBUF=$env:HB
55+
}
56+
5357
$env:ADSP_LIBRARY_PATH="$basedir\lib"
5458

5559
& "$basedir\bin\$tool" `

0 commit comments

Comments
 (0)