Skip to content

Commit 458f834

Browse files
AnastaZIukAnastaZIuk
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents 622742f + 01e0577 commit 458f834

File tree

17 files changed

+615
-193
lines changed

17 files changed

+615
-193
lines changed

‎.github/workflows/presubmit.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ permissions:
55
contents: read
66

77
jobs:
8+
validate_json:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v5
12+
- name: Validate
13+
run: python3 tools/check_grammar/check_grammar.py include/spirv/unified1/*.json
14+
815
build:
916
name: Build ${{ matrix.os }}
1017
runs-on: ${{ matrix.os }}
1118
strategy:
1219
matrix:
1320
os: [ubuntu-latest, macos-latest, windows-latest]
1421
steps:
15-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
1623
- name: Install Ubuntu packages
1724
if: matrix.os == 'ubuntu-latest'
1825
run: sudo apt install -y dos2unix
@@ -52,7 +59,7 @@ jobs:
5259
test_cmake_min_required:
5360
runs-on: ubuntu-latest
5461
steps:
55-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v5
5663
- uses: lukka/get-cmake@latest
5764
with:
5865
cmakeVersion: 3.14.0
@@ -64,7 +71,7 @@ jobs:
6471
test_cmake_latest:
6572
runs-on: ubuntu-latest
6673
steps:
67-
- uses: actions/checkout@v4
74+
- uses: actions/checkout@v5
6875
- uses: lukka/get-cmake@latest
6976
- name: CMake build
7077
run: |
@@ -74,7 +81,7 @@ jobs:
7481
add_subdirectory:
7582
runs-on: ubuntu-latest
7683
steps:
77-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v5
7885
- uses: lukka/get-cmake@latest
7986
with:
8087
cmakeVersion: 3.15.0
@@ -86,7 +93,7 @@ jobs:
8693
find_package:
8794
runs-on: ubuntu-latest
8895
steps:
89-
- uses: actions/checkout@v4
96+
- uses: actions/checkout@v5
9097
- uses: lukka/get-cmake@latest
9198
with:
9299
cmakeVersion: 3.15.0
@@ -102,7 +109,7 @@ jobs:
102109
find_pkg_config:
103110
runs-on: ubuntu-latest
104111
steps:
105-
- uses: actions/checkout@v4
112+
- uses: actions/checkout@v5
106113
- uses: lukka/get-cmake@latest
107114
with:
108115
cmakeVersion: 3.15.0
@@ -119,7 +126,7 @@ jobs:
119126
find_pkg_config_absolute:
120127
runs-on: ubuntu-latest
121128
steps:
122-
- uses: actions/checkout@v4
129+
- uses: actions/checkout@v5
123130
- uses: lukka/get-cmake@latest
124131
with:
125132
cmakeVersion: 3.15.0
@@ -141,6 +148,6 @@ jobs:
141148
container: khronosgroup/docker-images@sha256:724f67d8562445523644abf017d5d192b369fafc122de75e9d26792c649821a0
142149

143150
steps:
144-
- uses: actions/checkout@v4
151+
- uses: actions/checkout@v5
145152
- name: REUSE license checker
146153
run: reuse lint

‎BUILD.bazel‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ filegroup(
128128
srcs = ["include/spirv/unified1/extinst.tosa.001000.1.grammar.json"],
129129
)
130130

131+
filegroup(
132+
name = "spirv_ext_inst_arm_motion_engine_100",
133+
srcs = ["include/spirv/unified1/extinst.arm.motion-engine.100.grammar.json"],
134+
)
135+
131136
cc_library(
132137
name = "spirv_common_headers",
133138
hdrs = [
@@ -137,6 +142,7 @@ cc_library(
137142
"include/spirv/1.1/OpenCL.std.h",
138143
"include/spirv/1.2/GLSL.std.450.h",
139144
"include/spirv/1.2/OpenCL.std.h",
145+
"include/spirv/unified1/ArmMotionEngine.100.h",
140146
"include/spirv/unified1/GLSL.std.450.h",
141147
"include/spirv/unified1/NonSemanticClspvReflection.h",
142148
"include/spirv/unified1/NonSemanticDebugPrintf.h",

‎include/spirv/unified1/ArmMotionEngine.100.h‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// SPDX-FileCopyrightText: 2022-2025 Arm Ltd.
2+
// SPDX-License-Identifier: MIT
3+
4+
#ifndef SPIRV_UNIFIED1_ArmMotionEngine_100_H_
5+
#define SPIRV_UNIFIED1_ArmMotionEngine_100_H_
6+
7+
#ifdef __cplusplus
8+
extern "C" {
9+
#endif
10+
11+
enum {
12+
ArmMotionEngineVersion = 100,
13+
ArmMotionEngineVersion_BitWidthPadding = 0x7fffffff
14+
};
15+
enum {
16+
ArmMotionEngineRevision = 1,
17+
ArmMotionEngineRevision_BitWidthPadding = 0x7fffffff
18+
};
19+
20+
enum ArmMotionEngineInstructions {
21+
ArmMotionEngineMIN_SAD = 0,
22+
ArmMotionEngineMIN_SAD_COST = 1,
23+
ArmMotionEngineRAW_SAD = 2,
24+
ArmMotionEngineInstructionsMax = 0x7fffffff
25+
};
26+
27+
28+
#ifdef __cplusplus
29+
}
30+
#endif
31+
32+
#endif // SPIRV_UNIFIED1_ArmMotionEngine_100_H_

‎include/spirv/unified1/extinst.arm.motion-engine.100.grammar.json‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"copyright": [
3+
"SPDX-FileCopyrightText: 2022-2025 Arm Ltd.",
4+
"SPDX-License-Identifier: MIT"
5+
],
6+
"version": 100,
7+
"revision": 1,
8+
"instructions": [
9+
{
10+
"opname": "MIN_SAD",
11+
"opcode": 0,
12+
"operands": [
13+
{
14+
"kind": "IdRef",
15+
"name": "kernel_sizes"
16+
},
17+
{
18+
"kind": "IdRef",
19+
"name": "search_window_sizes"
20+
},
21+
{
22+
"kind": "IdRef",
23+
"name": "input_strides"
24+
},
25+
{
26+
"kind": "IdRef",
27+
"name": "window_strides"
28+
},
29+
{
30+
"kind": "IdRef",
31+
"name": "window_offsets"
32+
},
33+
{
34+
"kind": "IdRef",
35+
"name": "padding"
36+
},
37+
{
38+
"kind": "IdRef",
39+
"name": "search_pattern"
40+
},
41+
{
42+
"kind": "IdRef",
43+
"name": "input0"
44+
},
45+
{
46+
"kind": "IdRef",
47+
"name": "input1"
48+
}
49+
]
50+
},
51+
{
52+
"opname": "MIN_SAD_COST",
53+
"opcode": 1,
54+
"operands": [
55+
{
56+
"kind": "IdRef",
57+
"name": "kernel_sizes"
58+
},
59+
{
60+
"kind": "IdRef",
61+
"name": "search_window_sizes"
62+
},
63+
{
64+
"kind": "IdRef",
65+
"name": "input_strides"
66+
},
67+
{
68+
"kind": "IdRef",
69+
"name": "window_strides"
70+
},
71+
{
72+
"kind": "IdRef",
73+
"name": "window_offsets"
74+
},
75+
{
76+
"kind": "IdRef",
77+
"name": "padding"
78+
},
79+
{
80+
"kind": "IdRef",
81+
"name": "search_pattern"
82+
},
83+
{
84+
"kind": "IdRef",
85+
"name": "input0"
86+
},
87+
{
88+
"kind": "IdRef",
89+
"name": "input1"
90+
}
91+
]
92+
},
93+
{
94+
"opname": "RAW_SAD",
95+
"opcode": 2,
96+
"operands": [
97+
{
98+
"kind": "IdRef",
99+
"name": "kernel_sizes"
100+
},
101+
{
102+
"kind": "IdRef",
103+
"name": "search_window_sizes"
104+
},
105+
{
106+
"kind": "IdRef",
107+
"name": "input_strides"
108+
},
109+
{
110+
"kind": "IdRef",
111+
"name": "window_strides"
112+
},
113+
{
114+
"kind": "IdRef",
115+
"name": "window_offsets"
116+
},
117+
{
118+
"kind": "IdRef",
119+
"name": "padding"
120+
},
121+
{
122+
"kind": "IdRef",
123+
"name": "input0"
124+
},
125+
{
126+
"kind": "IdRef",
127+
"name": "input1"
128+
}
129+
]
130+
}
131+
],
132+
"operand_kinds": []
133+
}

0 commit comments

Comments
 (0)