diff options
147 files changed, 2959 insertions, 3097 deletions
diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 2ed8af05..00000000 --- a/CHANGELOG +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | This file will only list major changes that occur within a release. | ||
2 | For a full list of changes, view the git log of the repository. | ||
3 | |||
4 | Rocko Release 11/2017 | ||
5 | ===================== | ||
6 | |||
7 | Moved qat support to separate layer | ||
8 | ----------------------------------- | ||
9 | Quick Assist Technology (QAT) is more middleware and should not be part of the | ||
10 | core BSP. The new layer can be found here: | ||
11 | https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-qat/ | ||
12 | |||
13 | Moved dpdk support to separate layer | ||
14 | ------------------------------------ | ||
15 | We had some requests to make DPDK standalone so that it could be included | ||
16 | without bringing in anything else from meta-intel, as it is not specific to | ||
17 | Intel(R) hardware. The new layer is located here: | ||
18 | https://git.yoctoproject.org/cgit/cgit.cgi/meta-dpdk/ | ||
19 | |||
20 | Added support for out-of-tree iwlwifi drivers | ||
21 | --------------------------------------------- | ||
22 | Backport-iwlwifi out-of-tree wifi modules are now available via meta-intel. | ||
23 | Backport-iwlwifi brings the latest iwlwifi drivers to almost any kernel | ||
24 | Note that mac80211 and cfg80211 backports are also necessary, which will most | ||
25 | likely cause incompatibility with other in-tree wifi drivers. | ||
26 | See https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi for more info. | ||
27 | |||
28 | Added support for out-of-tree ixgbe drivers | ||
29 | ------------------------------------------- | ||
30 | The out-of-tree ixgbe drivers bring ixgbe support to nearly any kernel. See | ||
31 | here: http://www.intel.com/network/connectivity/products/server_adapters.htm | ||
32 | |||
33 | Added an implementation of Secure Boot | ||
34 | -------------------------------------- | ||
35 | meta-intel now supports a simple Secure Boot implementation. This implementation | ||
36 | consists of a single binary consisting of an EFI stub, the kernel, an | ||
37 | initrd, and a kernel command line. The binary is then signed via keys defined by | ||
38 | the variables SECUREBOOT_SIGNING_KEY and SECUREBOOT_SIGNING_CERT. These keys | ||
39 | should match the keys embedded in your hardware's firmware. | ||
40 | See documentation/secureboot/README for more information on this feature. | ||
41 | |||
42 | Improved Yocto Project Compatibility status | ||
43 | ------------------------------------------- | ||
44 | The common layer should now be considered Yocto Project compatible - it should | ||
45 | no longer modify OE-core values when adding the layer to your bblayers.conf. | ||
46 | The meta-tlk layer is still not Yocto Project compatible, however. | ||
47 | |||
48 | Pyro Release 5/2017 | ||
49 | =================== | ||
50 | |||
51 | Changed default kernel provider from linux-yocto to linux-intel. | ||
52 | ---------------------------------------------------------------- | ||
53 | Linux-intel is an Intel(R)-maintained kernel based on the latest stable | ||
54 | branch, along with backports from upstream to better support Intel(R) | ||
55 | hardware. The intel-linux kernel also has a branch with the preempt-rt | ||
56 | patches applied, providing a preempt-rt kernel with no additional work. | ||
57 | |||
58 | Added QEMU support. | ||
59 | ------------------- | ||
60 | We now build several virtio drivers into the kernel by default, and | ||
61 | have qemuboot.conf files for intel-corei7-64 and intel-core2-32 | ||
62 | targets. This allows one to do basic testing on meta-intel images | ||
63 | without having to use hardware. The virtio drivers are added via | ||
64 | KERNEL_FEATURES_INTEL_COMMON. This prevents them from being added to | ||
65 | custom kernels by default. They can be removed by adding the | ||
66 | following to a conf or kernel bbappend file: | ||
67 | KERNEL_FEATURES_INTEL_COMMON:remove = “cfg/virtio.scc” | ||
68 | OVMF firmware is also built and can be used in order to emulate a UEFI | ||
69 | environment. A full runqemu command line for intel-corei7-64 could look | ||
70 | like this: | ||
71 | runqemu core-image-minimal intel-corei7-64 wic ovmf | ||
72 | |||
73 | Musl support | ||
74 | ------------ | ||
75 | Meta-intel is now compatible with the musl C library. You can specify musl | ||
76 | As your C library by adding the following to your local.conf: | ||
77 | TCLIBC = “musl” | ||
78 | Note: there is a known failure with DPDK. | ||
79 | |||
80 | X32 support | ||
81 | ----------- | ||
82 | The meta-intel layer can now build with the x32 tune settings in a multi-lib | ||
83 | setting, it will not work in as the primary MACHINE tune as the bootloader needs | ||
84 | to be built as a 64bit binary. The setup for this would be as follows: | ||
85 | require conf/multilib.conf | ||
86 | MULTILIBS = "multilib:libx32 | ||
87 | DEFAULTTUNE:virtclass-multilib-libx32 = "corei7-64-x32" | ||
diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 73a9fe3a..00000000 --- a/MAINTAINERS +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | This file contains a list of BSP maintainers for the BSPs contained in | ||
2 | the meta-intel repository. | ||
3 | |||
4 | The purpose of this file is to provide contact information for | ||
5 | specific BSPs and other code contained within meta-intel. You should | ||
6 | address questions and patches for a particular BSP or other code to | ||
7 | the appropriate maintainer listed in this file, cc'ing the meta-intel | ||
8 | mailing list. This ensures that your question or patch will be | ||
9 | addressed by the appropriate person, and that it will be seen by other | ||
10 | users who may be facing similar problems or questions. | ||
11 | |||
12 | Please see the top-level README file for guidelines relating to the | ||
13 | details of submitting patches, reporting problems, or asking questions | ||
14 | about any of the BSPs or other recipes contained within meta-intel. | ||
15 | |||
16 | Descriptions of section entries: | ||
17 | |||
18 | M: Mail patches to: FullName <address@domain> | ||
19 | F: Files and directories with wildcard patterns. | ||
20 | A trailing slash includes all files and subdirectory files. | ||
21 | F: common/ all files in and below common | ||
22 | F: common/* all files in common, but not below | ||
23 | One pattern per line. Multiple F: lines acceptable. | ||
24 | |||
25 | Please keep this list in alphabetical order. | ||
26 | |||
27 | Maintainers List (try to look for most precise areas first) | ||
28 | |||
29 | ----------------------------------- | ||
30 | |||
31 | M: Anuj Mittal <anuj.mittal@intel.com> | ||
32 | F: * | ||
diff --git a/README b/README deleted file mode 100644 index f05a5872..00000000 --- a/README +++ /dev/null | |||
@@ -1,466 +0,0 @@ | |||
1 | meta-intel | ||
2 | ========== | ||
3 | |||
4 | This README file contains information on building and booting | ||
5 | meta-intel BSP layers. Please see the corresponding sections below | ||
6 | for details. | ||
7 | |||
8 | |||
9 | Yocto Project Compatible | ||
10 | ======================== | ||
11 | |||
12 | The BSPs contained in this layer are compatible with the Yocto Project | ||
13 | as per the requirements listed here: | ||
14 | |||
15 | https://www.yoctoproject.org/webform/yocto-project-compatible-registration | ||
16 | |||
17 | |||
18 | Dependencies | ||
19 | ============ | ||
20 | |||
21 | This layer depends on: | ||
22 | |||
23 | URI: git://git.openembedded.org/bitbake | ||
24 | |||
25 | URI: git://git.openembedded.org/openembedded-core | ||
26 | layers: meta | ||
27 | branch: master | ||
28 | |||
29 | |||
30 | Table of Contents | ||
31 | ================= | ||
32 | |||
33 | I. Overview | ||
34 | II. Building and booting meta-intel BSP layers | ||
35 | a. Building the intel-common BSP layers | ||
36 | b. Booting the intel-common BSP images | ||
37 | c. Building the installer image | ||
38 | III. Technical Miscellany | ||
39 | Benefits of using meta-intel | ||
40 | The intel-common kernel package architecture | ||
41 | Intel-specific machine features | ||
42 | IV. Tested Hardware | ||
43 | V. Guidelines for submitting patches | ||
44 | |||
45 | |||
46 | I. Overview | ||
47 | =========== | ||
48 | |||
49 | This is the location for Intel-maintained BSPs. | ||
50 | |||
51 | For details on the intel-common, see the information below. | ||
52 | |||
53 | For all others, please see the README files contained in the | ||
54 | individual BSP layers for BSP-specific information. | ||
55 | |||
56 | If you have problems with or questions about a particular BSP, please | ||
57 | contact the maintainer listed in the MAINTAINERS file directly (cc:ing | ||
58 | the Yocto mailing list puts it in the archive and helps other people | ||
59 | who might have the same questions in the future), but please try to do | ||
60 | the following first: | ||
61 | |||
62 | - look in the Yocto Project Bugzilla | ||
63 | (http://bugzilla.yoctoproject.org/) to see if a problem has | ||
64 | already been reported | ||
65 | |||
66 | - look through recent entries of the meta-intel | ||
67 | (https://lists.yoctoproject.org/pipermail/meta-intel/) and Yocto | ||
68 | (https://lists.yoctoproject.org/pipermail/yocto/) mailing list | ||
69 | archives to see if other people have run into similar problems or | ||
70 | had similar questions answered. | ||
71 | |||
72 | If you believe you have encountered a bug, you can open a new bug and | ||
73 | enter the details in the Yocto Project Bugzilla | ||
74 | (http://bugzilla.yoctoproject.org/). If you're relatively certain | ||
75 | that it's a bug against the BSP itself, please use the 'Yocto Project | ||
76 | Components: BSPs | meta-intel' category for the bug; otherwise, please | ||
77 | submit the bug against the most likely category for the problem - if | ||
78 | you're wrong, it's not a big deal and the bug will be recategorized | ||
79 | upon triage. | ||
80 | |||
81 | |||
82 | II. Building and booting meta-intel BSP layers | ||
83 | ============================================== | ||
84 | |||
85 | The following sections contain information on building and booting the | ||
86 | BSPs contained in the meta-intel layer. | ||
87 | |||
88 | Note that these instructions specifically cover the intel-common, which | ||
89 | may or may not be applicable to other BSPs contained in this layer - if | ||
90 | a given BSP contains its own README, that version should be used instead, | ||
91 | and these instructions can be ignored. | ||
92 | |||
93 | a. Building the intel-common BSP layers | ||
94 | ------------------------------------------------- | ||
95 | |||
96 | In order to build an image with BSP support for a given release, you | ||
97 | need to download the corresponding BSP tarball from the 'Board Support | ||
98 | Package (BSP) Downloads' page of the Yocto Project website (or | ||
99 | equivalently, check out the appropriate branch from the meta-intel git | ||
100 | repository, see below). For the intel-common BSPs, those tarballs would | ||
101 | correspond to the following choices in the BSP downloads section: | ||
102 | |||
103 | - Intel-core2-32 Intel® Common Core BSP (Intel-core2-32) | ||
104 | - Intel-corei7-64 Intel® Common Core BSP (Intel-corei7-64) | ||
105 | |||
106 | The intel-* BSPs, also known as the intel-common BSPs, provide a few | ||
107 | carefully selected tune options and generic hardware support to cover | ||
108 | the majority of current Intel CPUs and devices. The naming follows the | ||
109 | convention of intel-<TUNE>-<BITS>, where TUNE is the gcc cpu-type | ||
110 | (used with mtune and march typically) and BITS is either 32 bit or 64 | ||
111 | bit. | ||
112 | |||
113 | Having done that, and assuming you extracted the BSP tarball contents | ||
114 | at the top-level of your yocto build tree, you can build a BSP image | ||
115 | by adding the location of the meta-intel layer to bblayers.conf e.g.: | ||
116 | |||
117 | yocto/meta-intel \ | ||
118 | |||
119 | To enable a particular machine, you need to add a MACHINE line naming | ||
120 | the BSP to the local.conf file: | ||
121 | |||
122 | MACHINE ?= "xxx" | ||
123 | |||
124 | where 'xxx' is replaced by one of the following BSP names: | ||
125 | |||
126 | - intel-core2-32 | ||
127 | |||
128 | This BSP is optimized for the Core2 family of CPUs as well as all | ||
129 | Atom CPUs prior to the Silvermont core. | ||
130 | |||
131 | - intel-corei7-64 | ||
132 | |||
133 | This BSP is optimized for Nehalem and later Core and Xeon CPUs as | ||
134 | well as Silvermont and later Atom CPUs, such as the Baytrail SoCs. | ||
135 | |||
136 | You should then be able to build an image as such: | ||
137 | |||
138 | $ source oe-init-build-env | ||
139 | $ bitbake core-image-sato | ||
140 | |||
141 | At the end of a successful build, you should have an image that | ||
142 | you can boot from a USB flash drive (see instructions on how to do | ||
143 | that below, in the section 'Booting the intel-common BSP images'). | ||
144 | |||
145 | As an alternative to downloading the BSP tarball, you can also work | ||
146 | directly from the meta-intel git repository. For each BSP in the | ||
147 | 'meta-intel' repository, there are multiple branches, one | ||
148 | corresponding to each major release starting with 'laverne' (0.90), in | ||
149 | addition to the latest code which tracks the current master (note that | ||
150 | not all BSPs are present in every release). Instead of extracting | ||
151 | a BSP tarball at the top level of your yocto build tree, you can | ||
152 | equivalently check out the appropriate branch from the meta-intel | ||
153 | repository at the same location. | ||
154 | |||
155 | b. Booting the intel-common BSP images | ||
156 | -------------------------------------- | ||
157 | |||
158 | If you've built your own image, either from the downloaded BSP layer | ||
159 | or from the meta-intel git repository, you'll find the bootable | ||
160 | image in the build/tmp/deploy/images/xxx directory, where again | ||
161 | 'xxx' refers to the machine name used in the build. | ||
162 | |||
163 | Under Linux, insert a USB flash drive. Assuming the USB flash drive | ||
164 | takes device /dev/sdf, use dd to copy the image to it. Before the image | ||
165 | can be burned onto a USB drive, it should be un-mounted. Some Linux distros | ||
166 | may automatically mount a USB drive when it is plugged in. Using USB device | ||
167 | /dev/sdf as an example, find all mounted partitions: | ||
168 | |||
169 | $ mount | grep sdf | ||
170 | |||
171 | and un-mount those that are mounted, for example: | ||
172 | |||
173 | $ umount /dev/sdf1 | ||
174 | $ umount /dev/sdf2 | ||
175 | |||
176 | Now burn the image onto the USB drive: | ||
177 | |||
178 | $ sudo dd if=core-image-sato-intel-corei7-64.wic of=/dev/sdf status=progress | ||
179 | $ sync | ||
180 | $ eject /dev/sdf | ||
181 | |||
182 | This should give you a bootable USB flash device. Insert the device | ||
183 | into a bootable USB socket on the target, and power on. This should | ||
184 | result in a system booted to the Sato graphical desktop. | ||
185 | |||
186 | If you want a terminal, use the arrows at the top of the UI to move to | ||
187 | different pages of available applications, one of which is named | ||
188 | 'Terminal'. Clicking that should give you a root terminal. | ||
189 | |||
190 | If you want to ssh into the system, you can use the root terminal to | ||
191 | ifconfig the IP address and use that to ssh in. The root password is | ||
192 | empty, so to log in type 'root' for the user name and hit 'Enter' at | ||
193 | the Password prompt: and you should be in. | ||
194 | |||
195 | If you find you're getting corrupt images on the USB (it doesn't show | ||
196 | the syslinux boot: prompt, or the boot: prompt contains strange | ||
197 | characters), try doing this first: | ||
198 | |||
199 | $ dd if=/dev/zero of=/dev/sdf bs=1M count=512 | ||
200 | |||
201 | c. Building the installer image | ||
202 | ----------------------------------------------- | ||
203 | |||
204 | If you plan to install your image to your target machine, you can build a wic | ||
205 | based installer image instead of default wic image. To build it, you need to | ||
206 | add below configuration to local.conf : | ||
207 | |||
208 | WKS_FILE = "image-installer.wks.in" | ||
209 | IMAGE_FSTYPES:append = " ext4" | ||
210 | IMAGE_TYPEDEP_wic = "ext4" | ||
211 | INITRD_IMAGE_LIVE="core-image-minimal-initramfs" | ||
212 | do_image_wic[depends] += "${INITRD_IMAGE_LIVE}:do_image_complete" | ||
213 | do_rootfs[depends] += "virtual/kernel:do_deploy" | ||
214 | IMAGE_BOOT_FILES:append = "\ | ||
215 | ${KERNEL_IMAGETYPE} \ | ||
216 | microcode.cpio \ | ||
217 | ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext4;rootfs.img \ | ||
218 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', 'grub-efi-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
219 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', '${IMAGE_ROOTFS}/boot/EFI/BOOT/grub.cfg;EFI/BOOT/grub.cfg', '', d)} \ | ||
220 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', 'systemd-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
221 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/loader.conf;loader/loader.conf ', '', d)} \ | ||
222 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/entries/boot.conf;loader/entries/boot.conf', '', d)} " | ||
223 | |||
224 | Burn the wic image onto USB flash device, insert the device to target machine | ||
225 | and power on. This should start the installation process. | ||
226 | |||
227 | III. Technical Miscellany | ||
228 | ========================= | ||
229 | |||
230 | Benefits of using meta-intel | ||
231 | ---------------------------- | ||
232 | |||
233 | Using meta-intel has the following benefits over a generic BSP: | ||
234 | |||
235 | tune flags | ||
236 | ++++++++++ | ||
237 | intel-* MACHINEs each have different compilation flags appropriate for their | ||
238 | targeted hardware sets. intel-corei7-64 has tune flags appropriate for modern | ||
239 | 64-bit Intel Core i microarchitecture, and includes instruction sets up to | ||
240 | SSE4.2. intel-core2-32 has tune flags appropriate for legacy 32-bit Intel Core2 | ||
241 | microarchitecture, and includes instruction sets up to SSE3. | ||
242 | |||
243 | linux-intel kernel | ||
244 | ++++++++++++++++++ | ||
245 | The linux-intel kernel is an initiative to bring better Intel(R) hardware | ||
246 | support to the current LTS linux kernel. It contains a base LTS kernel with | ||
247 | additional backports from upstream Intel drivers. In addition, a default kernel | ||
248 | config containing most features found on Intel boards is supplied via the | ||
249 | yocto-kernel-cache. | ||
250 | |||
251 | graphics stack | ||
252 | ++++++++++++++ | ||
253 | Meta-intel provides the latest Intel Graphics Linux Stack drivers to support | ||
254 | Intel hardware as defined by the https://01.org/linuxgraphics. | ||
255 | |||
256 | Other software | ||
257 | ++++++++++++++ | ||
258 | * intel ucode - provides the latest microcode updates for Intel processors | ||
259 | |||
260 | * thermald - which proactively controls thermal, using P-states, T-states, and | ||
261 | the Intel power clamp driver. | ||
262 | (https://01.org/linux-thermal-daemon/documentation/introduction-thermal-daemon) | ||
263 | |||
264 | The intel-common kernel package architecture | ||
265 | -------------------------------------------- | ||
266 | |||
267 | These BSPs use what we call the intel-common Linux kernel package | ||
268 | architecture. This includes core2-32-intel-common and | ||
269 | corei7-64-intel-common. These kernel packages can also be used by any | ||
270 | of the BSPs in meta-intel that choose to include the | ||
271 | intel-common-pkgarch.inc file. | ||
272 | |||
273 | To minimize the proliferation of vendor trees, reduce the sources we | ||
274 | must support, and consolidate QA efforts, all BSP maintainers are | ||
275 | encouraged to make use of the intel-common Linux kernel package | ||
276 | architecture. | ||
277 | |||
278 | Intel-specific machine features | ||
279 | ------------------------------- | ||
280 | |||
281 | The meta-intel layer makes some additional machine features available | ||
282 | to BSPs. These machine features can be used in a BSP layer in the | ||
283 | same way that machine features are used in other layers based on | ||
284 | oe-core, via the MACHINE_FEATURES variable. | ||
285 | |||
286 | Requirements | ||
287 | ++++++++++++ | ||
288 | |||
289 | The meta-intel-specific machine features are only available to a BSP | ||
290 | when the meta-intel layer is included in the build configuration, and | ||
291 | the meta-intel.inc file is included in the machine configuration of | ||
292 | that BSP. | ||
293 | |||
294 | To make these features available for your machine, you will need to: | ||
295 | |||
296 | 1. include a configuration line such as the below in bblayers.conf | ||
297 | BBLAYERS += "<local path>/meta-intel" | ||
298 | 2. include the following line in the machine configuration file | ||
299 | require conf/machine/include/meta-intel.inc | ||
300 | |||
301 | Once the above requirements are met, the machine features provided by | ||
302 | the meta-intel layer will be available for the BSP to use. | ||
303 | |||
304 | Available machine features | ||
305 | ++++++++++++++++++++++++++ | ||
306 | |||
307 | Currently, the meta-intel layer makes the following set of | ||
308 | Intel-specific machine features available: | ||
309 | |||
310 | * intel-ucode | ||
311 | |||
312 | These machine features can be included by listing them in the | ||
313 | MACHINE_FEATURES variable in the machine configuration file. For | ||
314 | example: | ||
315 | |||
316 | MACHINE_FEATURES += "intel-ucode" | ||
317 | |||
318 | Machine feature details | ||
319 | +++++++++++++++++++++++ | ||
320 | |||
321 | * intel-ucode | ||
322 | |||
323 | This feature provides support for microcode updates to Intel | ||
324 | processors. The intel-ucode feature runs at early boot and uses | ||
325 | the microcode data file added by the feature into the BSP's | ||
326 | initrd. It also puts the userland microcode-updating tool, | ||
327 | iucode_tool, into the target images along with the microcode data | ||
328 | file. | ||
329 | |||
330 | Q. Why might a user want to enable the intel-ucode feature? | ||
331 | |||
332 | A. Intel releases microcode updates to correct processor behavior | ||
333 | as documented in the respective processor specification | ||
334 | updates. While the normal approach to getting such microcode | ||
335 | updates is via a BIOS upgrade, this can be an administrative | ||
336 | hassle and not always possible in the field. The intel-ucode | ||
337 | feature enables the microcode update capability present in the | ||
338 | Linux kernel. It provides an easy path for upgrading processor | ||
339 | microcode without the need to change the BIOS. If the feature | ||
340 | is enabled, it is also possible to update the existing target | ||
341 | images with a newer microcode update in the future. | ||
342 | |||
343 | Q. How would a user bundle only target-specific microcode in the | ||
344 | target image? | ||
345 | |||
346 | A. The Intel microcode data file released by Intel contains | ||
347 | microcode updates for multiple processors. If the BSP image is | ||
348 | meant to run on only a certain subset of processor types, a | ||
349 | processor-specific subset of microcode can be bundled into the | ||
350 | target image via the UCODE_FILTER_PARAMETERS variable. This | ||
351 | works by listing a sequence of iucode-tool parameters in the | ||
352 | UCODE_FILTER_PARAMETERS variable, which in this case will | ||
353 | select only the specific microcode relevant to the BSP. For | ||
354 | more information on the underlying parameters refer to the | ||
355 | iucode-tool manual page at http://manned.org/iucode-tool | ||
356 | |||
357 | To define a set of parameters for microcode-filtering via the | ||
358 | UCODE_FILTER_PARAMETERS variable, one needs to identify the | ||
359 | cpuid signatures of all the processors the BSP is meant to run | ||
360 | on. One way to determine the cpuid signature for a specific | ||
361 | processor is to build and run an intel-ucode-feature-enabled | ||
362 | image on the target hardware, without first assigning any value | ||
363 | to the UCODE_FILTER_PARAMETERS variable, and then once the | ||
364 | image is booted, run the "ucode_tool -S" command to have the | ||
365 | ucode tool scan the system for processor signatures. These | ||
366 | signatures can then be used in the UCODE_FILTER_PARAMETERS | ||
367 | variable in conjunction with -s parameter. For example, for | ||
368 | the fri2 BSP, the cpuid can be determined as such: | ||
369 | |||
370 | [root@fri2 ~]# iucode_tool -S | ||
371 | iucode_tool: system has processor(s) with signature 0x00020661 | ||
372 | |||
373 | Given that output, a suitable UCODE_FILTER_PARAMETERS variable | ||
374 | definition could be specified in the machine configuration as | ||
375 | such: | ||
376 | |||
377 | UCODE_FILTER_PARAMETERS = "-s 0x00020661" | ||
378 | |||
379 | Q. Are there any reasons a user might want to disable the | ||
380 | intel-ucode feature? | ||
381 | |||
382 | A. The microcode data file and associated tools occupy a small | ||
383 | amount of space (a few KB) on the target image. BSPs which are | ||
384 | highly sensitive to target image size and which are not | ||
385 | experiencing microcode-related issues might consider not | ||
386 | enabling this feature. | ||
387 | |||
388 | |||
389 | IV. Tested Hardware | ||
390 | =================== | ||
391 | |||
392 | The following undergo regular basic testing with their respective MACHINE types. | ||
393 | Note that both 64-bit and 32-bit firmware is available for the MinnowBoard | ||
394 | Turbot, so it is tested against both intel-corei7-64 and intel-core2-32. | ||
395 | |||
396 | intel-corei7-64: | ||
397 | Tiger Lake (NUC11TNHi5) | ||
398 | Alder Lake-S | ||
399 | Kaby Lake: NUC7i7BNH | ||
400 | Elkhart Lake | ||
401 | |||
402 | intel-skylake-64: | ||
403 | Tiger Lake (NUC11TNHi5) | ||
404 | Alder Lake-S | ||
405 | Kaby Lake: NUC7i7BNH | ||
406 | Elkhart Lake | ||
407 | |||
408 | intel-core2-32: | ||
409 | MinnowBoard Turbot | ||
410 | |||
411 | |||
412 | V. Guidelines for submitting patches | ||
413 | ==================================== | ||
414 | |||
415 | Please submit any patches against meta-intel BSPs to the meta-intel | ||
416 | mailing list (meta-intel@lists.yoctoproject.org). Also, if your patches are | ||
417 | available via a public git repository, please also include a URL to | ||
418 | the repo and branch containing your patches as that makes it easier | ||
419 | for maintainers to grab and test your patches. | ||
420 | |||
421 | There are patch submission scripts available that will, among other | ||
422 | things, automatically include the repo URL and branch as mentioned. | ||
423 | Please see the Yocto Project Development Manual sections entitled | ||
424 | 'Using Scripts to Push a Change Upstream and Request a Pull' and | ||
425 | 'Using Email to Submit a Patch' for details. | ||
426 | |||
427 | Regardless of how you submit a patch or patchset, the patches should | ||
428 | at minimum follow the suggestions outlined in the 'Submitting a Change | ||
429 | to the Yocto Project' section in the Yocto Project Development Manual. | ||
430 | Specifically, they should: | ||
431 | |||
432 | - Include a 'Signed-off-by:' line. A commit can't legally be pulled | ||
433 | in without this. | ||
434 | |||
435 | - Provide a single-line, short summary of the change. This short | ||
436 | description should be prefixed by the BSP or recipe name, as | ||
437 | appropriate, followed by a colon. Capitalize the first character | ||
438 | of the summary (following the colon). | ||
439 | |||
440 | - For the body of the commit message, provide detailed information | ||
441 | that describes what you changed, why you made the change, and the | ||
442 | approach you used. | ||
443 | |||
444 | - If the change addresses a specific bug or issue that is associated | ||
445 | with a bug-tracking ID, include a reference to that ID in your | ||
446 | detailed description in the following format: [YOCTO #<bug-id>]. | ||
447 | |||
448 | - Pay attention to line length - please don't allow any particular | ||
449 | line in the commit message to stretch past 72 characters. | ||
450 | |||
451 | - For any non-trivial patch, provide information about how you | ||
452 | tested the patch, and for any non-trivial or non-obvious testing | ||
453 | setup, provide details of that setup. | ||
454 | |||
455 | Doing a quick 'git log' in meta-intel will provide you with many | ||
456 | examples of good example commits if you have questions about any | ||
457 | aspect of the preferred format. | ||
458 | |||
459 | The meta-intel maintainers will do their best to review and/or pull in | ||
460 | a patch or patchset within 24 hours of the time it was posted. For | ||
461 | larger and/or more involved patches and patchsets, the review process | ||
462 | may take longer. | ||
463 | |||
464 | Please see the meta-intel/MAINTAINERS file for the list of maintainers | ||
465 | and their specific areas; it's also a good idea to cc: the specific | ||
466 | maintainer, if applicable. | ||
diff --git a/README.md b/README.md new file mode 100644 index 00000000..91577f1d --- /dev/null +++ b/README.md | |||
@@ -0,0 +1,36 @@ | |||
1 | # meta-intel | ||
2 | |||
3 | OpenEmbedded/Yocto BSP layer for Intel platforms. | ||
4 | |||
5 | ## Dependencies | ||
6 | |||
7 | This layer primarily depends on OpenEmbedded-Core (OE-Core). However, certain | ||
8 | recipes may require additional layers to support optional features or | ||
9 | programming languages not supported by OE-Core. Such recipes are located within | ||
10 | the `dynamic-layers` directory. | ||
11 | |||
12 | Base dependencies: | ||
13 | - [Bitbake](https://git.openembedded.org/bitbake) | ||
14 | - [OE-Core](https://git.openembedded.org/openembedded-core) | ||
15 | |||
16 | Dynamic additional dependencies: | ||
17 | |||
18 | - [meta-openembedded](https://git.openembedded.org/meta-openembedded/tree/meta-oe) | ||
19 | - [meta-python](https://git.openembedded.org/meta-openembedded/tree/meta-python) | ||
20 | - [meta-clang](https://github.com/kraj/meta-clang.git) | ||
21 | |||
22 | |||
23 | ## Contents | ||
24 | |||
25 | - [Building and booting meta-intel BSP layers](documentation/building_and_booting.md) | ||
26 | - [Intel oneAPI DPC++/C++ Compiler](documentation/dpcpp-compiler.md) | ||
27 | - [Build Image with OpenVINO™ toolkit](documentation/openvino.md) | ||
28 | - [Tested Hardware](documentation/tested_hardware.md) | ||
29 | - [Guidelines for submitting patches](documentation/submitting_patches.md) | ||
30 | - [Reporting bugs](documentation/reporting_bugs.md) | ||
31 | - [Reporting security bugs](SECURITY.md) | ||
32 | |||
33 | ## Maintainers | ||
34 | |||
35 | - Anuj Mittal <anuj.mittal@intel.com> | ||
36 | |||
diff --git a/README.sources b/README.sources deleted file mode 100644 index 9b483ee0..00000000 --- a/README.sources +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | The sources for the packages comprising the images shipped with this | ||
2 | BSP can be found at the following location: | ||
3 | |||
4 | http://downloads.yoctoproject.org/mirror/sources/ | ||
5 | |||
6 | The metadata used to generate the images shipped with this BSP, in | ||
7 | addition to the code contained in this BSP, can be found at the | ||
8 | following location: | ||
9 | |||
10 | http://downloads.yoctoproject.org/releases/yocto/yocto-2.7/poky-warrior-21.0.0.tar.bz2 | ||
11 | |||
12 | The metadata used to generate the images shipped with this BSP, in | ||
13 | addition to the code contained in this BSP, can also be found at the | ||
14 | following locations: | ||
15 | |||
16 | git://git.yoctoproject.org/poky.git | ||
17 | git://git.yoctoproject.org/meta-intel | ||
diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..e70fcb0f --- /dev/null +++ b/SECURITY.md | |||
@@ -0,0 +1,6 @@ | |||
1 | # Security Policy | ||
2 | Intel is committed to rapidly addressing security vulnerabilities affecting our customers and providing clear guidance on the solution, impact, severity and mitigation. | ||
3 | |||
4 | ## Reporting a Vulnerability | ||
5 | Please report any security vulnerabilities in this project [utilizing the guidelines here](https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html). | ||
6 | |||
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index b82868ec..9849d0d8 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc | |||
@@ -8,9 +8,10 @@ RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal <anuj.mittal@in | |||
8 | RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>" | 8 | RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>" |
9 | RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 9 | RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
10 | RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>" | 10 | RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>" |
11 | RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>" | 11 | RECIPE_MAINTAINER:pn-intel-cmt-cat = "Naveen Saini <naveen.kumar.saini@intel.com>" |
12 | RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>" | 12 | RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>" |
13 | RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>" | 13 | RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>" |
14 | RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
14 | RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 15 | RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
15 | RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 16 | RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
16 | RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>" | 17 | RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>" |
@@ -22,7 +23,6 @@ RECIPE_MAINTAINER:pn-itt = "Naveen Saini <naveen.kumar.saini@intel.com>" | |||
22 | RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>" | 23 | RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>" |
23 | RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>" | 24 | RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>" |
24 | RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>" | 25 | RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>" |
25 | RECIPE_MAINTAINER:pn-jhi = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
26 | RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>" | 26 | RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>" |
27 | RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>" | 27 | RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>" |
28 | RECIPE_MAINTAINER:pn-libva-intel = "Anuj Mittal <anuj.mittal@intel.com>" | 28 | RECIPE_MAINTAINER:pn-libva-intel = "Anuj Mittal <anuj.mittal@intel.com>" |
@@ -51,5 +51,4 @@ RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>" | |||
51 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>" | 51 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>" |
52 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" | 52 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" |
53 | RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" | 53 | RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" |
54 | RECIPE_MAINTAINER:pn-vc-intrinsics = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
55 | RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" | 54 | RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" |
diff --git a/conf/layer.conf b/conf/layer.conf index 77baa827..97dfb897 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -19,7 +19,7 @@ LAYERRECOMMENDS_intel = "dpdk" | |||
19 | # This should only be incremented on significant changes that will | 19 | # This should only be incremented on significant changes that will |
20 | # cause compatibility issues with other layers | 20 | # cause compatibility issues with other layers |
21 | LAYERVERSION_intel = "5" | 21 | LAYERVERSION_intel = "5" |
22 | LAYERSERIES_COMPAT_intel = "kirkstone langdale" | 22 | LAYERSERIES_COMPAT_intel = "kirkstone scarthgap" |
23 | 23 | ||
24 | BBFILES_DYNAMIC += " \ | 24 | BBFILES_DYNAMIC += " \ |
25 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ | 25 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ |
@@ -41,3 +41,5 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" | |||
41 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" | 41 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" |
42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" | 42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" |
43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" | 43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" |
44 | |||
45 | # addpylib ${LAYERDIR}/lib oeqa | ||
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index fa4d1415..230d0253 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -7,10 +7,9 @@ | |||
7 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" | 7 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" |
8 | PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel" | 8 | PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel" |
9 | 9 | ||
10 | PREFERRED_VERSION_linux-intel ?= "5.19%" | 10 | PREFERRED_VERSION_linux-intel ?= "6.6%" |
11 | PREFERRED_VERSION_linux-intel-rt ?= "5.19%" | 11 | PREFERRED_VERSION_linux-intel-rt ?= "6.6%" |
12 | PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.15%" | 12 | PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.8%" |
13 | PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.15%" | ||
14 | 13 | ||
15 | # Need to point to latest version of libva needed for media components | 14 | # Need to point to latest version of libva needed for media components |
16 | PREFERRED_PROVIDER_libva = "libva-intel" | 15 | PREFERRED_PROVIDER_libva = "libva-intel" |
@@ -21,9 +20,9 @@ PREFERRED_PROVIDER_libva-utils = "libva-intel-utils" | |||
21 | PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native" | 20 | PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native" |
22 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" | 21 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" |
23 | 22 | ||
24 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '14.0.3', '14.0.0', '15.0.0', d)}" | 23 | LLVM_MAJOR_VERSION = "${@d.getVar('LLVMVERSION').split('.')[0]}" |
25 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '14.0.3', '14.0.0', '15.0.0', d)}" | 24 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}" |
26 | 25 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}" | |
27 | 26 | ||
28 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | 27 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ |
29 | " | 28 | " |
@@ -33,7 +32,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURE | |||
33 | 32 | ||
34 | # recommended extra packages common to all intel machines | 33 | # recommended extra packages common to all intel machines |
35 | MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware" | 34 | MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware" |
36 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915" | 35 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915 kernel-module-igc kernel-module-r8152" |
37 | 36 | ||
38 | # for the early boot time kernel microcode loading support, | 37 | # for the early boot time kernel microcode loading support, |
39 | # merge the microcode data in the final initrd image. | 38 | # merge the microcode data in the final initrd image. |
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc index 6ac84a55..17a1234d 100644 --- a/conf/machine/include/qemuboot-intel.inc +++ b/conf/machine/include/qemuboot-intel.inc | |||
@@ -15,5 +15,4 @@ QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client" | |||
15 | QB_AUDIO_DRV = "alsa" | 15 | QB_AUDIO_DRV = "alsa" |
16 | QB_AUDIO_OPT = "-device AC97" | 16 | QB_AUDIO_OPT = "-device AC97" |
17 | QB_KERNEL_CMDLINE_APPEND = " oprofile.timer=1" | 17 | QB_KERNEL_CMDLINE_APPEND = " oprofile.timer=1" |
18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | QB_OPT_APPEND = " -usb -usbdevice tablet " |
19 | QB_OPT_APPEND = " -usb -usbdevice tablet -device virtio-rng-pci" | ||
diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc deleted file mode 100644 index 05b7283c..00000000 --- a/conf/machine/include/tune-skylake.inc +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | # Settings for the GCC(1) cpu-type "skylake": | ||
2 | # | ||
3 | # Intel Skylake CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, | ||
4 | # SSE4.2, AVX, AVX2 and POPCNT instruction set support. | ||
5 | # | ||
6 | # This tune is recommended for Intel Skylake CPU (and beyond). | ||
7 | # | ||
8 | DEFAULTTUNE ?= "skylake-64" | ||
9 | |||
10 | # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS | ||
11 | require conf/machine/include/x86/tune-corei7.inc | ||
12 | |||
13 | # Extra tune features | ||
14 | TUNEVALID[skylake] = "Enable skylake specific processor optimizations" | ||
15 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake ${SKYLAKE_TUNE} -mfpmath=sse', '', d)}" | ||
16 | |||
17 | # Extra tune selections | ||
18 | |||
19 | AVAILTUNES += "skylake-64" | ||
20 | TUNE_FEATURES:tune-skylake-64 = "${TUNE_FEATURES:tune-x86-64} skylake" | ||
21 | BASE_LIB:tune-skylake-64 = "lib64" | ||
22 | TUNE_PKGARCH:tune-skylake-64 = "skylake-64" | ||
23 | PACKAGE_EXTRA_ARCHS:tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} skylake-64" | ||
24 | QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client" | ||
25 | |||
26 | |||
27 | # Disable QEMU usermode by default (get avx2) | ||
28 | MACHINE_FEATURES:remove = "qemu-usermode" | ||
29 | |||
30 | # If qemu-usermode is enabled, we have to disable avx2 ISA extensions, but we can keep mtune as skylake vs generic | ||
31 | SKYLAKE_TUNE .= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', ' -mtune=skylake ${QEMU_UNAVAILABLE_ISA}', '-mtune=generic -mavx2', d)}" | ||
32 | |||
33 | QEMU_UNAVAILABLE_ISA = " \ | ||
34 | -mno-avx \ | ||
35 | -mno-avx2 \ | ||
36 | -mno-avx512f \ | ||
37 | -mno-avx512er \ | ||
38 | -mno-avx512cd \ | ||
39 | -mno-avx512pf \ | ||
40 | -mno-avx512dq \ | ||
41 | -mno-avx512bw \ | ||
42 | -mno-avx512vl \ | ||
43 | -mno-avx512ifma \ | ||
44 | -mno-avx512vbmi \ | ||
45 | -mno-avx512vbmi2 \ | ||
46 | -mno-avx512vnni \ | ||
47 | -mno-avx512bitalg \ | ||
48 | " | ||
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index 47d53fa0..a2b392c2 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | require conf/machine/include/meta-intel.inc | 6 | require conf/machine/include/meta-intel.inc |
7 | require conf/machine/include/x86/x86-base.inc | 7 | require conf/machine/include/x86/x86-base.inc |
8 | require conf/machine/include/tune-skylake.inc | 8 | require conf/machine/include/x86/tune-x86-64-v3.inc |
9 | require conf/machine/include/intel-common-pkgarch.inc | 9 | require conf/machine/include/intel-common-pkgarch.inc |
10 | 10 | ||
11 | MACHINE_FEATURES += "efi" | 11 | MACHINE_FEATURES += "efi" |
diff --git a/documentation/building_and_booting.md b/documentation/building_and_booting.md new file mode 100644 index 00000000..478a4fb0 --- /dev/null +++ b/documentation/building_and_booting.md | |||
@@ -0,0 +1,134 @@ | |||
1 | ### Building the Intel BSP layers | ||
2 | |||
3 | The intel-common BSP provide a few carefully selected tune options and | ||
4 | generic hardware support to cover the majority of current Intel CPUs and | ||
5 | devices. The naming follows the convention of intel-<TUNE>-<BITS>, where | ||
6 | TUNE is the gcc cpu-type (used with mtune and march typically) and BITS | ||
7 | is either 32 bit or 64 bit. | ||
8 | |||
9 | In order to build an image with BSP support for a given release, you | ||
10 | need to clone the meta-intel layer from git repository: | ||
11 | ``` | ||
12 | git clone https://git.yoctoproject.org/meta-intel | ||
13 | ``` | ||
14 | |||
15 | Check out the appropriate branch or release tags. The branch name and tags | ||
16 | would align with Yocto Project | ||
17 | [Release Codenames](https://wiki.yoctoproject.org/wiki/Releases). | ||
18 | Assuming meta-intel repository is cloned at the top-level of | ||
19 | OE-Core build tree, you can build a BSP image by adding the location of | ||
20 | the meta-intel layer to bblayers.conf: | ||
21 | ``` | ||
22 | BBLAYERS = " \ | ||
23 | /openembedded-core/meta \ | ||
24 | /openembedded-core/meta-intel " | ||
25 | ``` | ||
26 | |||
27 | To enable a particular machine, add a MACHINE line naming the BSP | ||
28 | to the local.conf file: | ||
29 | ``` | ||
30 | MACHINE ?= "intel-corei7-64" | ||
31 | ``` | ||
32 | |||
33 | where this can be replaced by other MACHINE types available: | ||
34 | |||
35 | - intel-core2-32 | ||
36 | |||
37 | This BSP is optimized for the Core2 family of CPUs as well as all | ||
38 | Atom CPUs prior to the Silvermont core. | ||
39 | |||
40 | - intel-corei7-64 | ||
41 | |||
42 | This BSP is optimized for Nehalem and later Core and Xeon CPUs as | ||
43 | well as Silvermont and later Atom CPUs, such as the Baytrail SoCs. | ||
44 | |||
45 | - intel-skylake-64 | ||
46 | |||
47 | This BSP uses [x86-64-v3 tuning](https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html). | ||
48 | |||
49 | You should then be able to build an image as such: | ||
50 | ``` | ||
51 | $ source oe-init-build-env | ||
52 | $ bitbake core-image-sato | ||
53 | ``` | ||
54 | |||
55 | At the end of a successful build, you should have an image that | ||
56 | you can boot from a USB flash drive. | ||
57 | |||
58 | |||
59 | ## Booting the intel-common BSP images | ||
60 | |||
61 | If you've built your own image, you'll find the bootable | ||
62 | image in the build/tmp/deploy/images/{MACHINE} directory, where | ||
63 | 'MACHINE' refers to the machine name used in the build. | ||
64 | |||
65 | Under Linux, insert a USB flash drive. Assuming the USB flash drive | ||
66 | takes device /dev/sdf, use dd to copy the image to it. Before the image | ||
67 | can be burned onto a USB drive, it should be un-mounted. Some Linux distros | ||
68 | may automatically mount a USB drive when it is plugged in. Using USB device | ||
69 | /dev/sdf as an example, find all mounted partitions: | ||
70 | ``` | ||
71 | $ mount | grep sdf | ||
72 | ``` | ||
73 | |||
74 | and un-mount those that are mounted, for example: | ||
75 | ``` | ||
76 | $ umount /dev/sdf1 | ||
77 | $ umount /dev/sdf2 | ||
78 | ``` | ||
79 | |||
80 | Now burn the image onto the USB drive: | ||
81 | ``` | ||
82 | $ sudo dd if=core-image-sato-intel-corei7-64.wic of=/dev/sdf status=progress | ||
83 | $ sync | ||
84 | $ eject /dev/sdf | ||
85 | ``` | ||
86 | |||
87 | This should give you a bootable USB flash device. Insert the device | ||
88 | into a bootable USB socket on the target, and power on. This should | ||
89 | result in a system booted to the Sato graphical desktop. | ||
90 | |||
91 | If you want a terminal, use the arrows at the top of the UI to move to | ||
92 | different pages of available applications, one of which is named | ||
93 | 'Terminal'. Clicking that should give you a root terminal. | ||
94 | |||
95 | If you want to ssh into the system, you can use the root terminal to | ||
96 | ifconfig the IP address and use that to ssh in. The root password is | ||
97 | empty, so to log in type 'root' for the user name and hit 'Enter' at | ||
98 | the Password prompt: and you should be in. | ||
99 | |||
100 | If you find you're getting corrupt images on the USB (it doesn't show | ||
101 | the syslinux boot: prompt, or the boot: prompt contains strange | ||
102 | characters), try doing this first: | ||
103 | ``` | ||
104 | $ dd if=/dev/zero of=/dev/sdf bs=1M count=512 | ||
105 | ``` | ||
106 | |||
107 | ## Building the installer image | ||
108 | |||
109 | If you plan to install your image to your target machine, you can build a wic | ||
110 | based installer image instead of default wic image. To build it, you need to | ||
111 | add below configuration to local.conf : | ||
112 | |||
113 | ``` | ||
114 | WKS_FILE = "image-installer.wks.in" | ||
115 | IMAGE_FSTYPES:append = " ext4" | ||
116 | IMAGE_TYPEDEP:wic = "ext4" | ||
117 | INITRD_IMAGE_LIVE="core-image-minimal-initramfs" | ||
118 | do_image_wic[depends] += "${INITRD_IMAGE_LIVE}:do_image_complete" | ||
119 | do_rootfs[depends] += "virtual/kernel:do_deploy" | ||
120 | IMAGE_BOOT_FILES:append = "\ | ||
121 | ${KERNEL_IMAGETYPE} \ | ||
122 | microcode.cpio \ | ||
123 | ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.rootfs.ext4;rootfs.img \ | ||
124 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', 'grub-efi-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
125 | ${@bb.utils.contains('EFI_PROVIDER', 'grub-efi', '${IMAGE_ROOTFS}/boot/EFI/BOOT/grub.cfg;EFI/BOOT/grub.cfg', '', d)} \ | ||
126 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', 'systemd-bootx64.efi;EFI/BOOT/bootx64.efi', '', d)} \ | ||
127 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/loader.conf;loader/loader.conf ', '', d)} \ | ||
128 | ${@bb.utils.contains('EFI_PROVIDER', 'systemd-boot', '${IMAGE_ROOTFS}/boot/loader/entries/boot.conf;loader/entries/boot.conf', '', d)} " | ||
129 | ``` | ||
130 | |||
131 | Burn the wic image onto USB flash device, insert the device to target machine | ||
132 | and power on. This should start the installation process. | ||
133 | |||
134 | |||
diff --git a/documentation/openvino.md b/documentation/openvino.md new file mode 100644 index 00000000..50dc680d --- /dev/null +++ b/documentation/openvino.md | |||
@@ -0,0 +1,95 @@ | |||
1 | Build a Yocto Image with OpenVINO™ toolkit | ||
2 | ========================================== | ||
3 | |||
4 | Follow the [Yocto Project official documentation](https://docs.yoctoproject.org/brief-yoctoprojectqs/index.html#compatible-linux-distribution) to set up and configure your host machine to be compatible with BitBake. | ||
5 | |||
6 | ## Step 1: Set Up Environment | ||
7 | |||
8 | 1. Clone the repositories. | ||
9 | |||
10 | ``` | ||
11 | git clone https://git.yoctoproject.org/git/poky | ||
12 | git clone https://github.com/openembedded/meta-openembedded | ||
13 | git clone https://git.yoctoproject.org/git/meta-intel | ||
14 | ``` | ||
15 | |||
16 | |||
17 | 2. Set up the OpenEmbedded build environment. | ||
18 | |||
19 | ``` | ||
20 | source poky/oe-init-build-env | ||
21 | |||
22 | ``` | ||
23 | |||
24 | |||
25 | |||
26 | 3. Add BitBake layers. | ||
27 | |||
28 | |||
29 | ``` | ||
30 | bitbake-layers add-layer ../meta-openembedded/meta-oe | ||
31 | bitbake-layers add-layer ../meta-openembedded/meta-python | ||
32 | bitbake-layers add-layer ../meta-intel | ||
33 | |||
34 | ``` | ||
35 | |||
36 | |||
37 | 4. Set up BitBake configurations. | ||
38 | Include extra configuration in the `conf/local.conf` file in your build directory as required. | ||
39 | |||
40 | |||
41 | ``` | ||
42 | MACHINE = "intel-skylake-64" | ||
43 | |||
44 | # Enable building OpenVINO Python API. | ||
45 | # This requires meta-python layer to be included in bblayers.conf. | ||
46 | PACKAGECONFIG:append:pn-openvino-inference-engine = " python3" | ||
47 | |||
48 | # This adds OpenVINO related libraries in the target image. | ||
49 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine" | ||
50 | |||
51 | # This adds OpenVINO samples in the target image. | ||
52 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-samples" | ||
53 | |||
54 | # Include OpenVINO Python API package in the target image. | ||
55 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-inference-engine-python3" | ||
56 | |||
57 | # Include model conversion API in the target image. | ||
58 | CORE_IMAGE_EXTRA_INSTALL:append = " openvino-model-optimizer" | ||
59 | |||
60 | ``` | ||
61 | |||
62 | ## Step 2: Build a Yocto Image with OpenVINO Packages | ||
63 | |||
64 | Run BitBake to build your image with OpenVINO packages. For example, to build the minimal image, run the following command: | ||
65 | |||
66 | |||
67 | ``` | ||
68 | bitbake core-image-minimal | ||
69 | |||
70 | ``` | ||
71 | |||
72 | ## Step 3: Verify the Yocto Image | ||
73 | |||
74 | Verify that OpenVINO packages were built successfully. Run the following command: | ||
75 | |||
76 | ``` | ||
77 | oe-pkgdata-util list-pkgs | grep openvino | ||
78 | |||
79 | ``` | ||
80 | |||
81 | |||
82 | If the image build is successful, it will return the list of packages as below: | ||
83 | |||
84 | ``` | ||
85 | openvino-inference-engine | ||
86 | openvino-inference-engine-dbg | ||
87 | openvino-inference-engine-dev | ||
88 | openvino-inference-engine-python3 | ||
89 | openvino-inference-engine-samples | ||
90 | openvino-inference-engine-src | ||
91 | openvino-model-optimizer | ||
92 | openvino-model-optimizer-dbg | ||
93 | openvino-model-optimizer-dev | ||
94 | |||
95 | ``` | ||
diff --git a/documentation/reporting_bugs.md b/documentation/reporting_bugs.md new file mode 100644 index 00000000..5fbc3d27 --- /dev/null +++ b/documentation/reporting_bugs.md | |||
@@ -0,0 +1,22 @@ | |||
1 | ## Reporting bugs | ||
2 | |||
3 | If you have problems with or questions about a particular BSP, please | ||
4 | contact the maintainer listed in the [Maintainer](../README.md#maintainers) section directly (cc:ing | ||
5 | the Yocto mailing list puts it in the archive and helps other people | ||
6 | who might have the same questions in the future), but please try to do | ||
7 | the following first: | ||
8 | |||
9 | - look in the [Yocto Project Bugzilla](http://bugzilla.yoctoproject.org/) to see if a | ||
10 | problem has already been reported | ||
11 | |||
12 | - look through recent entries of the [meta-intel](https://lists.yoctoproject.org/g/meta-intel/messages) | ||
13 | and [Yocto Archives](https://lists.yoctoproject.org/g/yocto/messages) mailing list archives to see | ||
14 | if other people have run into similar problems or had similar questions answered. | ||
15 | |||
16 | If you believe you have encountered a bug, you can open a new bug and | ||
17 | enter the details in the [Yocto Project Bugzilla](https://bugzilla.yoctoproject.org/). | ||
18 | If you're relatively certain that it's a bug against the BSP itself, please use the | ||
19 | 'BSPs | bsps-meta-intel' category for the bug; otherwise, please submit the bug against | ||
20 | the most likely category for the problem. if you're wrong, it's not a big deal and | ||
21 | the bug will be recategorized upon triage. | ||
22 | |||
diff --git a/documentation/secureboot/README b/documentation/secureboot/README deleted file mode 100644 index 3d5703bb..00000000 --- a/documentation/secureboot/README +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Currently, only one implementation of Secure Boot is available out of the box, | ||
2 | which is using a single signed EFI application to directly boot the kernel with | ||
3 | an optional initramfs. | ||
4 | |||
5 | This can be added to your build either through local.conf, or via your own | ||
6 | custom image recipe. | ||
7 | |||
8 | If you are adding it via local.conf, set the following variables: | ||
9 | |||
10 | IMAGE_FEATURES += "secureboot" | ||
11 | WKS_FILE = "generic-bootdisk.wks.in" | ||
12 | SECURE_BOOT_SIGNING_KEY = "/path/to/your/signing/key" | ||
13 | SECURE_BOOT_SIGNING_CERT = "/path/to/your/signing/cert" | ||
14 | IMAGE_CLASSES += "uefi-comboapp" | ||
15 | |||
16 | If working with an image recipe, you can inherit uefi-comboapp directly instead | ||
17 | of using the IMAGE_CLASSES variable. | ||
18 | |||
19 | The signing keys and certs can be created via openssl commands. Here's an | ||
20 | example: | ||
21 | openssl req -new -x509 -newkey rsa:2048 -subj "/CN=your-subject/" -keyout \ | ||
22 | your-key.key -out your-key.crt -days 365 -nodes -sha256 | ||
23 | openssl x509 -in your-key.crt -out your-key.cer -outform DER | ||
24 | |||
25 | The .crt file is your SECURE_BOOT_SIGNING_CERT, and the .key file is your | ||
26 | SECURE_BOOT_SIGNING_KEY. | ||
27 | |||
28 | You should enroll the .crt key in your firmware under the PK, KEK, and DB | ||
29 | options (methods are different depending on your firmware). If a key should ever | ||
30 | become invalid, enroll it under DBX to blacklist it. | ||
31 | |||
32 | The comboapp can be further manipulated in a number of ways. You can modify the | ||
33 | kernel command line via the APPEND variable, you can change the default UUID via | ||
34 | the DISK_SIGNATURE_UUID variable, and you can modify the contents of the | ||
35 | initramfs via the INITRD_IMAGE or INITRD_LIVE variables. | ||
36 | |||
37 | A simple Secure Boot enabled image used for testing can be viewed at: | ||
38 | common/recipes-selftest/images/secureboot-selftest-image-signed.bb | ||
diff --git a/documentation/submitting_patches.md b/documentation/submitting_patches.md new file mode 100644 index 00000000..f36c4b08 --- /dev/null +++ b/documentation/submitting_patches.md | |||
@@ -0,0 +1,26 @@ | |||
1 | ## Guidelines for submitting patches | ||
2 | |||
3 | Please submit any patches against meta-intel BSPs to the | ||
4 | [meta-intel mailing list](https://lists.yoctoproject.org/g/meta-intel) | ||
5 | (email: meta-intel@lists.yoctoproject.org). Also, if your patches are | ||
6 | available via a public git repository, please also include a URL to | ||
7 | the repo and branch containing your patches as that makes it easier | ||
8 | for maintainers to grab and test your patches. | ||
9 | |||
10 | The patches should follow the suggestions outlined in the | ||
11 | [Yocto Project and OpenEmbedded Contributor Guide](https://docs.yoctoproject.org/dev/contributor-guide/index.html). | ||
12 | In addition, for any non-trivial patch, provide information about how you | ||
13 | tested the patch, and for any non-trivial or non-obvious testing | ||
14 | setup, provide details of that setup. | ||
15 | |||
16 | Doing a quick 'git log' in meta-intel will provide you with many | ||
17 | examples of good example commits if you have questions about any | ||
18 | aspect of the preferred format. | ||
19 | |||
20 | The meta-intel maintainers will do their best to review and/or pull in | ||
21 | a patch or patch sets within 24 hours of the time it was posted. For | ||
22 | larger and/or more involved patches and patch sets, the review process | ||
23 | may take longer. | ||
24 | |||
25 | Please see the [maintainers](../README.md#maintainers) section for the list of maintainers. It's also | ||
26 | a good idea to cc: the maintainer, if applicable. | ||
diff --git a/documentation/tested_hardware.md b/documentation/tested_hardware.md new file mode 100644 index 00000000..48a25ab4 --- /dev/null +++ b/documentation/tested_hardware.md | |||
@@ -0,0 +1,24 @@ | |||
1 | ## Tested Hardware | ||
2 | |||
3 | The following undergo regular basic testing with their respective MACHINE types. | ||
4 | |||
5 | - intel-corei7-64: | ||
6 | * Alder Lake-P | ||
7 | * Alder Lake-S | ||
8 | * Alder Lake-PS | ||
9 | * Elkhart Lake | ||
10 | * Metor Lake-P | ||
11 | * Raptor Lake-P | ||
12 | * Tiger Lake | ||
13 | |||
14 | - intel-skylake-64: | ||
15 | * Alder Lake-P | ||
16 | * Alder Lake-S | ||
17 | * Alder Lake-PS | ||
18 | * Elkhart Lake | ||
19 | * Metor Lake-P | ||
20 | * Raptor Lake-P | ||
21 | * Tiger Lake | ||
22 | |||
23 | - intel-core2-32: | ||
24 | * MinnowBoard Turbot | ||
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.7.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb index ad3c1638..afea70df 100644 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.7.1.bb +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb | |||
@@ -3,7 +3,7 @@ SUMMARY = "Deep Neural Network Library" | |||
3 | DESCRIPTION = "This software is a user mode library that accelerates\ | 3 | DESCRIPTION = "This software is a user mode library that accelerates\ |
4 | deep-learning applications and frameworks on Intel architecture." | 4 | deep-learning applications and frameworks on Intel architecture." |
5 | LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0" | 5 | LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ |
7 | file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ | 7 | file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ |
8 | file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ | 8 | file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ |
9 | file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ | 9 | file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ |
@@ -12,9 +12,11 @@ SECTION = "lib" | |||
12 | 12 | ||
13 | inherit pkgconfig cmake ptest | 13 | inherit pkgconfig cmake ptest |
14 | 14 | ||
15 | DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}" | ||
16 | |||
15 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
16 | SRCREV = "a96c94f39773df35760d037d1ebe580dcf79c137" | 18 | SRCREV = "ecd7fb6d5a0df6503d1691c1754a684b9c769c16" |
17 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.7;protocol=https \ | 19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \ |
18 | file://run-ptest \ | 20 | file://run-ptest \ |
19 | " | 21 | " |
20 | 22 | ||
@@ -32,10 +34,11 @@ EXTRA_OECMAKE += " \ | |||
32 | -DDNNL_CPU_RUNTIME=OMP \ | 34 | -DDNNL_CPU_RUNTIME=OMP \ |
33 | -DDNNL_ARCH_OPT_FLAGS="" \ | 35 | -DDNNL_ARCH_OPT_FLAGS="" \ |
34 | -DCMAKE_SKIP_RPATH=ON \ | 36 | -DCMAKE_SKIP_RPATH=ON \ |
37 | -DONEDNN_BUILD_GRAPH=OFF \ | ||
35 | " | 38 | " |
36 | 39 | ||
37 | PACKAGECONFIG ??= "gpu" | 40 | PACKAGECONFIG ??= "gpu" |
38 | PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime" | 41 | PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers virtual/opencl-icd, intel-compute-runtime" |
39 | 42 | ||
40 | do_install:append () { | 43 | do_install:append () { |
41 | install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs | 44 | install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs |
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch deleted file mode 100644 index 4e25420c..00000000 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From b9bc0df996d1e65fd70d5eb2d40866693f23bb67 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Thu, 24 Jun 2021 17:53:27 +0800 | ||
4 | Subject: [PATCH] CMakeLists.txt: link with libclang-cpp library instead | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
9 | --- | ||
10 | CMakeLists.txt | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
14 | index ef88317e..7507d6a5 100644 | ||
15 | --- a/CMakeLists.txt | ||
16 | +++ b/CMakeLists.txt | ||
17 | @@ -281,7 +281,7 @@ if (WASM_ENABLED) | ||
18 | list(APPEND ISPC_TARGETS wasm-i32x4) | ||
19 | endif() | ||
20 | |||
21 | -set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) | ||
22 | +set(CLANG_LIBRARY_LIST clang-cpp) | ||
23 | set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp) | ||
24 | |||
25 | if (X86_ENABLED) | ||
26 | -- | ||
27 | 2.17.1 | ||
28 | |||
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/6a1b2ffae0cc12467838bc671e3b089924de90a6.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/6a1b2ffae0cc12467838bc671e3b089924de90a6.patch deleted file mode 100644 index 6aac0c79..00000000 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/6a1b2ffae0cc12467838bc671e3b089924de90a6.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 6a1b2ffae0cc12467838bc671e3b089924de90a6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Babokin <dmitry.y.babokin@intel.com> | ||
3 | Date: Thu, 5 May 2022 16:34:34 -0700 | ||
4 | Subject: [PATCH] Bump ISPC version v1.19.0dev | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Include only the LLVM specific bits and not the ispc version bump. | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | diff --git a/src/ispc_version.h b/src/ispc_version.h | ||
13 | index 0e28dfcfa..2b9d9b0cc 100644 | ||
14 | --- a/src/ispc_version.h | ||
15 | +++ b/src/ispc_version.h | ||
16 | @@ -51,7 +51,7 @@ | ||
17 | #define ISPC_LLVM_15_0 150000 | ||
18 | |||
19 | #define OLDEST_SUPPORTED_LLVM ISPC_LLVM_10_0 | ||
20 | -#define LATEST_SUPPORTED_LLVM ISPC_LLVM_14_0 | ||
21 | +#define LATEST_SUPPORTED_LLVM ISPC_LLVM_15_0 | ||
22 | |||
23 | #ifdef __ispc__xstr | ||
24 | #undef __ispc__xstr | ||
25 | @@ -63,7 +63,7 @@ | ||
26 | __ispc__xstr(LLVM_VERSION_MAJOR) "." __ispc__xstr(LLVM_VERSION_MINOR) "." __ispc__xstr(LLVM_VERSION_PATCH) | ||
27 | |||
28 | #if ISPC_LLVM_VERSION < OLDEST_SUPPORTED_LLVM || ISPC_LLVM_VERSION > LATEST_SUPPORTED_LLVM | ||
29 | -#error "Only LLVM 11.0 - 14.0 are supported" | ||
30 | +#error "Only LLVM 11.0 - 14.0 and 15.0 development branch are supported" | ||
31 | #endif | ||
32 | |||
33 | #define ISPC_VERSION_STRING \ | ||
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch deleted file mode 100644 index a5ab8c19..00000000 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda Mon Sep 17 00:00:00 2001 | ||
2 | From: Arina Neshlyaeva <arina.neshlyaeva@intel.com> | ||
3 | Date: Tue, 23 Aug 2022 15:21:50 -0700 | ||
4 | Subject: [PATCH] Adjust opt passes for LLVM 15 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
8 | --- | ||
9 | src/opt.cpp | 17 +++++++++++++++++ | ||
10 | 1 file changed, 17 insertions(+) | ||
11 | |||
12 | diff --git a/src/opt.cpp b/src/opt.cpp | ||
13 | index 910821e26..86219f384 100644 | ||
14 | --- a/src/opt.cpp | ||
15 | +++ b/src/opt.cpp | ||
16 | @@ -84,6 +84,9 @@ | ||
17 | #include <llvm/Transforms/Scalar.h> | ||
18 | #include <llvm/Transforms/Scalar/GVN.h> | ||
19 | #include <llvm/Transforms/Scalar/InstSimplifyPass.h> | ||
20 | +#if ISPC_LLVM_VERSION >= ISPC_LLVM_15_0 | ||
21 | +#include <llvm/Transforms/Scalar/SimpleLoopUnswitch.h> | ||
22 | +#endif | ||
23 | #include <llvm/Transforms/Utils.h> | ||
24 | #include <llvm/Transforms/Utils/BasicBlockUtils.h> | ||
25 | |||
26 | @@ -647,7 +650,11 @@ void ispc::Optimize(llvm::Module *module, int optLevel) { | ||
27 | optPM.add(llvm::createCFGSimplificationPass()); | ||
28 | #endif | ||
29 | |||
30 | +#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0 | ||
31 | + // Starting LLVM 15.0 this pass is supported with new pass manager only (217e857) | ||
32 | + // TODO: switch ISPC to new pass manager: https://github.com/ispc/ispc/issues/2359 | ||
33 | optPM.add(llvm::createArgumentPromotionPass()); | ||
34 | +#endif | ||
35 | |||
36 | optPM.add(llvm::createAggressiveDCEPass()); | ||
37 | optPM.add(llvm::createInstructionCombiningPass(), 241); | ||
38 | @@ -722,7 +729,11 @@ void ispc::Optimize(llvm::Module *module, int optLevel) { | ||
39 | optPM.add(CreateInstructionSimplifyPass()); | ||
40 | |||
41 | optPM.add(llvm::createFunctionInliningPass()); | ||
42 | +#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0 | ||
43 | + // Starting LLVM 15.0 this pass is supported with new pass manager only (217e857) | ||
44 | + // TODO: switch ISPC to new pass manager: https://github.com/ispc/ispc/issues/2359 | ||
45 | optPM.add(llvm::createArgumentPromotionPass()); | ||
46 | +#endif | ||
47 | |||
48 | optPM.add(llvm::createSROAPass()); | ||
49 | |||
50 | @@ -736,7 +747,13 @@ void ispc::Optimize(llvm::Module *module, int optLevel) { | ||
51 | optPM.add(llvm::createReassociatePass()); | ||
52 | optPM.add(llvm::createLoopRotatePass()); | ||
53 | optPM.add(llvm::createLICMPass()); | ||
54 | + // Loop unswitch pass was removed in LLVM 15.0 (fb4113). | ||
55 | + // Recommended replacement: createSimpleLoopUnswitchLegacyPass | ||
56 | +#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0 | ||
57 | optPM.add(llvm::createLoopUnswitchPass(false)); | ||
58 | +#else | ||
59 | + optPM.add(llvm::createSimpleLoopUnswitchLegacyPass(false)); | ||
60 | +#endif | ||
61 | optPM.add(llvm::createInstructionCombiningPass()); | ||
62 | optPM.add(CreateInstructionSimplifyPass()); | ||
63 | optPM.add(llvm::createIndVarSimplifyPass()); | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch index 4646856d..265fcfa2 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 40e9344d37d62158e6c9f72919f0595ef5fde61a Mon Sep 17 00:00:00 2001 | 1 | From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001 |
2 | From: Dongwon Kim <dongwon.kim@intel.com> | 2 | From: Dongwon Kim <dongwon.kim@intel.com> |
3 | Date: Sat, 21 Aug 2021 16:09:39 -0700 | 3 | Date: Sat, 21 Aug 2021 16:09:39 -0700 |
4 | Subject: [PATCH] Build not able to locate cpp_generation_tool. | 4 | Subject: [PATCH] Build not able to locate cpp_generation_tool. |
@@ -7,28 +7,27 @@ Upstream-Status: Inappropriate [oe specific] | |||
7 | 7 | ||
8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
9 | Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> | 9 | Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> |
10 | |||
11 | --- | 10 | --- |
12 | shared/source/built_ins/kernels/CMakeLists.txt | 8 ++++---- | 11 | shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++----- |
13 | 1 file changed, 4 insertions(+), 4 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
14 | 13 | ||
15 | diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt | 14 | diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt |
16 | index 769e2a100..eef25747e 100644 | 15 | index ed85a37c52..f7c9e79137 100644 |
17 | --- a/shared/source/built_ins/kernels/CMakeLists.txt | 16 | --- a/shared/source/built_ins/kernels/CMakeLists.txt |
18 | +++ b/shared/source/built_ins/kernels/CMakeLists.txt | 17 | +++ b/shared/source/built_ins/kernels/CMakeLists.txt |
19 | @@ -94,9 +94,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo | 18 | @@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode |
20 | ) | 19 | ) |
21 | add_custom_command( | 20 | add_custom_command( |
22 | OUTPUT ${OUTPUT_FILE_CPP} | 21 | OUTPUT ${OUTPUT_FILE_CPP} |
23 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} | 22 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} |
24 | + COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID} | 23 | + COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} |
25 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | 24 | WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
26 | - DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool> | 25 | - DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool> |
27 | + DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool | 26 | + DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool |
28 | ) | 27 | ) |
29 | list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") | 28 | list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") |
30 | else() | 29 | else() |
31 | @@ -147,9 +147,9 @@ function(generate_cpp_spirv builtin) | 30 | @@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin) |
32 | ) | 31 | ) |
33 | add_custom_command( | 32 | add_custom_command( |
34 | OUTPUT ${OUTPUT_FILE_CPP} | 33 | OUTPUT ${OUTPUT_FILE_CPP} |
@@ -40,3 +39,13 @@ index 769e2a100..eef25747e 100644 | |||
40 | ) | 39 | ) |
41 | set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) | 40 | set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) |
42 | else() | 41 | else() |
42 | @@ -277,4 +277,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "") | ||
43 | ) | ||
44 | endif() | ||
45 | |||
46 | -apply_macro_for_each_core_type("SUPPORTED") | ||
47 | \ No newline at end of file | ||
48 | +apply_macro_for_each_core_type("SUPPORTED") | ||
49 | -- | ||
50 | 2.43.2 | ||
51 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch new file mode 100644 index 00000000..20d9b847 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | |||
4 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
5 | index d52e089778..bc0cf35014 100644 | ||
6 | --- a/CMakeLists.txt | ||
7 | +++ b/CMakeLists.txt | ||
8 | @@ -727,7 +727,7 @@ if(NOT MSVC) | ||
9 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest | ||
10 | endif() | ||
11 | endif() | ||
12 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla") | ||
13 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla") | ||
14 | |||
15 | if(USE_SANITIZE_UB) | ||
16 | check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER) | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch index 9ee8c96a..5f93b7b6 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1189028d9f77265edf6258a66f8ecadf3aad556a Mon Sep 17 00:00:00 2001 | 1 | From 1f58c22992ddea4167b01b44448528de427f50d5 Mon Sep 17 00:00:00 2001 |
2 | From: Dongwon Kim <dongwon.kim@intel.com> | 2 | From: Dongwon Kim <dongwon.kim@intel.com> |
3 | Date: Wed, 2 Mar 2022 15:52:45 -0800 | 3 | Date: Wed, 2 Mar 2022 15:52:45 -0800 |
4 | Subject: [PATCH] external ocloc | 4 | Subject: [PATCH] external ocloc |
@@ -11,7 +11,7 @@ Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> | |||
11 | 1 file changed, 8 insertions(+), 6 deletions(-) | 11 | 1 file changed, 8 insertions(+), 6 deletions(-) |
12 | 12 | ||
13 | diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake | 13 | diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake |
14 | index 9b6bd3cd3..0aba48709 100644 | 14 | index 2b44330831..03067c9df0 100644 |
15 | --- a/cmake/ocloc_cmd_prefix.cmake | 15 | --- a/cmake/ocloc_cmd_prefix.cmake |
16 | +++ b/cmake/ocloc_cmd_prefix.cmake | 16 | +++ b/cmake/ocloc_cmd_prefix.cmake |
17 | @@ -4,12 +4,14 @@ | 17 | @@ -4,12 +4,14 @@ |
@@ -22,19 +22,19 @@ index 9b6bd3cd3..0aba48709 100644 | |||
22 | - set(ocloc_cmd_prefix ocloc) | 22 | - set(ocloc_cmd_prefix ocloc) |
23 | -else() | 23 | -else() |
24 | - if(DEFINED NEO__IGC_LIBRARY_PATH) | 24 | - if(DEFINED NEO__IGC_LIBRARY_PATH) |
25 | - set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) | 25 | - set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>) |
26 | +if(NOT DEFINED ocloc_cmd_prefix) | 26 | +if(NOT DEFINED ocloc_cmd_prefix) |
27 | + if(WIN32) | 27 | + if(WIN32) |
28 | + set(ocloc_cmd_prefix ocloc) | 28 | + set(ocloc_cmd_prefix ocloc) |
29 | else() | 29 | else() |
30 | - set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) | 30 | - set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>) |
31 | + if(DEFINED NEO__IGC_LIBRARY_PATH) | 31 | + if(DEFINED NEO__IGC_LIBRARY_PATH) |
32 | + set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) | 32 | + set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) |
33 | + else() | 33 | + else() |
34 | + set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) | 34 | + set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>) |
35 | + endif() | 35 | + endif() |
36 | endif() | 36 | endif() |
37 | endif() | 37 | endif() |
38 | -- | 38 | -- |
39 | 2.20.1 | 39 | 2.37.3 |
40 | 40 | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.38.24278.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb index f7043a18..60125171 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.38.24278.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb | |||
@@ -4,27 +4,25 @@ is an open source project to converge Intel's development efforts \ | |||
4 | on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ | 4 | on OpenCL(TM) compute stacks supporting the GEN graphics hardware \ |
5 | architecture." | 5 | architecture." |
6 | 6 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT & Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9280143b568466d8fbe385f838078b93 \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ |
9 | file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" | 9 | file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.05 \ |
12 | " | 12 | file://disable-werror.patch \ |
13 | file://allow-to-find-cpp-generation-tool.patch \ | ||
14 | file://external-ocloc.patch \ | ||
15 | " | ||
13 | 16 | ||
14 | SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \ | 17 | SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587" |
15 | file://external-ocloc.patch \ | ||
16 | " | ||
17 | |||
18 | SRCREV = "f7a4790d84eba7d0ee2028a900625bdfc0c557b3" | ||
19 | 18 | ||
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
21 | 20 | ||
22 | DEPENDS += " intel-graphics-compiler gmmlib" | 21 | DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native" |
23 | DEPENDS:append:class-target = " intel-compute-runtime-native libva" | ||
24 | 22 | ||
25 | RDEPENDS:${PN} += " intel-graphics-compiler gmmlib" | 23 | RDEPENDS:${PN} += " intel-graphics-compiler gmmlib" |
26 | 24 | ||
27 | inherit cmake pkgconfig | 25 | inherit cmake pkgconfig qemu |
28 | 26 | ||
29 | COMPATIBLE_HOST = '(x86_64).*-linux' | 27 | COMPATIBLE_HOST = '(x86_64).*-linux' |
30 | COMPATIBLE_HOST:libc-musl = "null" | 28 | COMPATIBLE_HOST:libc-musl = "null" |
@@ -40,14 +38,20 @@ EXTRA_OECMAKE = " \ | |||
40 | 38 | ||
41 | EXTRA_OECMAKE:append:class-target = " \ | 39 | EXTRA_OECMAKE:append:class-target = " \ |
42 | -Docloc_cmd_prefix=ocloc \ | 40 | -Docloc_cmd_prefix=ocloc \ |
43 | " | 41 | -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ |
42 | " | ||
44 | 43 | ||
45 | PACKAGECONFIG ??= "" | 44 | PACKAGECONFIG ??= "" |
46 | PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" | 45 | PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero" |
47 | 46 | ||
48 | do_install:append:class-native() { | 47 | do_configure:prepend:class-target () { |
49 | install -d ${D}${bindir} | 48 | # Write out a qemu wrapper that will be used by cmake. |
50 | install ${B}/bin/cpp_generate_tool ${D}${bindir}/ | 49 | qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${B}/bin'),d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" |
50 | cat > ${WORKDIR}/qemuwrapper << EOF | ||
51 | #!/bin/sh | ||
52 | $qemu_binary "\$@" | ||
53 | EOF | ||
54 | chmod +x ${WORKDIR}/qemuwrapper | ||
51 | } | 55 | } |
52 | 56 | ||
53 | FILES:${PN} += " \ | 57 | FILES:${PN} += " \ |
@@ -57,6 +61,4 @@ FILES:${PN} += " \ | |||
57 | 61 | ||
58 | FILES:${PN}-dev = "${includedir}" | 62 | FILES:${PN}-dev = "${includedir}" |
59 | 63 | ||
60 | BBCLASSEXTEND = "native nativesdk" | ||
61 | |||
62 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 64 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch index 0dd75537..377081fd 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 16fb6c022380bbb3c48f21372fcb1da7f30d3903 Mon Sep 17 00:00:00 2001 | 1 | From 3d71670f8ad5b54d434c2f5f71713bb1d5433ae4 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Tue, 12 Oct 2021 23:46:42 +0800 | 3 | Date: Tue, 12 Oct 2021 23:46:42 +0800 |
4 | Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS | 4 | Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS |
@@ -14,22 +14,22 @@ Upstream-Status: Inappropriate | |||
14 | 14 | ||
15 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 15 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
16 | --- | 16 | --- |
17 | IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 2 +- | 17 | IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 20 | diff --git a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake |
21 | index be8e5557e..07ab40382 100644 | 21 | index d20d7f887..882e09fea 100644 |
22 | --- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 22 | --- a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake |
23 | +++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 23 | +++ b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake |
24 | @@ -112,7 +112,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) | 24 | @@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) |
25 | add_custom_command(OUTPUT ${BIF_OPT_BC_PATH} | 25 | COMMENT "vc_build_bif: Translating CMCL builtins: ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}" |
26 | COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} | 26 | COMMAND CMCLTranslatorTool -o ${BIF_CMCL_BC_NAME} ${BIF_CLANG_BC_NAME_FINAL} |
27 | COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}" | 27 | COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} |
28 | - DEPENDS opt ${BIF_CMCL_BC_PATH}) | 28 | - DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${BIF_CLANG_BC_PATH_FINAL} |
29 | + DEPENDS ${BIF_CMCL_BC_PATH}) | 29 | + DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL} |
30 | BYPRODUCTS ${BIF_OPT_BC_PATH} | ||
31 | SOURCES ${CMCL_SRC_PATH}) | ||
30 | set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE) | 32 | set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE) |
31 | endfunction() | ||
32 | |||
33 | -- | 33 | -- |
34 | 2.35.3 | 34 | 2.43.2 |
35 | 35 | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch new file mode 100644 index 00000000..dca75e22 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From e69a3181482e5f442756a61c7b683914072884f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Mon, 9 Jan 2023 11:43:05 +0800 | ||
4 | Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers | ||
5 | |||
6 | We clone the SPIRV headers and tools in a different directory to ensure | ||
7 | file path substitutions take place. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | |||
13 | --- | ||
14 | external/SPIRV-Tools/CMakeLists.txt | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt | ||
18 | index 9afa5746c..7ca24d5dc 100644 | ||
19 | --- a/external/SPIRV-Tools/CMakeLists.txt | ||
20 | +++ b/external/SPIRV-Tools/CMakeLists.txt | ||
21 | @@ -43,8 +43,8 @@ else() #By default use build from sources | ||
22 | message(STATUS "[SPIRV-Tools] : Building from source") | ||
23 | message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}") | ||
24 | |||
25 | - set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory | ||
26 | - set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Tools") | ||
27 | + set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Headers") # used in subdirectory | ||
28 | + set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Tools") | ||
29 | |||
30 | set(SPIRV-Tools_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR}/external/SPIRV-Tools/build") | ||
31 | set(IGC_BUILD__SPIRV-Headers_DIR "${SPIRV-Headers_SOURCE_DIR}") | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch index 24367f19..39443931 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch | |||
@@ -1,17 +1,19 @@ | |||
1 | From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001 | 1 | From 5648568e597acd0fed82aac3e6aef0f95a1b78d1 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Thu, 19 May 2022 22:50:09 +0800 | 3 | Date: Thu, 19 May 2022 22:50:09 +0800 |
4 | Subject: [PATCH] fix tblgen | 4 | Subject: [PATCH] fix tblgen |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | |||
6 | --- | 8 | --- |
7 | IGC/cmake/igc_llvm.cmake | 2 +- | 9 | IGC/cmake/igc_llvm.cmake | 2 +- |
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 11 | ||
10 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake | 12 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake |
11 | index 89c03fc49..85be9ae08 100644 | 13 | index 10322533c..9020cb3c8 100644 |
12 | --- a/IGC/cmake/igc_llvm.cmake | 14 | --- a/IGC/cmake/igc_llvm.cmake |
13 | +++ b/IGC/cmake/igc_llvm.cmake | 15 | +++ b/IGC/cmake/igc_llvm.cmake |
14 | @@ -48,7 +48,7 @@ else() | 16 | @@ -52,7 +52,7 @@ else() |
15 | set(LLVM_OPT_EXE "opt" CACHE STRING "") | 17 | set(LLVM_OPT_EXE "opt" CACHE STRING "") |
16 | 18 | ||
17 | set(LLVM_TABLEGEN_EXE "llvm-tblgen") | 19 | set(LLVM_TABLEGEN_EXE "llvm-tblgen") |
@@ -20,6 +22,3 @@ index 89c03fc49..85be9ae08 100644 | |||
20 | if(DEFINED LLVM_TABLEGEN) | 22 | if(DEFINED LLVM_TABLEGEN) |
21 | set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN}) | 23 | set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN}) |
22 | else() | 24 | else() |
23 | -- | ||
24 | 2.35.3 | ||
25 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch index 7dd36aec..650130a8 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c2b7f30dd56568482b1b7c2f22bafdf68736fc88 Mon Sep 17 00:00:00 2001 | 1 | From 0559332abd04b6c8bc70171d201f43d2e4735336 Mon Sep 17 00:00:00 2001 |
2 | From: Lee Chee Yang <chee.yang.lee@intel.com> | 2 | From: Lee Chee Yang <chee.yang.lee@intel.com> |
3 | Date: Wed, 2 Sep 2020 08:28:35 +0800 | 3 | Date: Wed, 2 Sep 2020 08:28:35 +0800 |
4 | Subject: [PATCH 3/5] Improve Reproducibility for src package | 4 | Subject: [PATCH] Improve Reproducibility for src package |
5 | 5 | ||
6 | Improve reproducibility for intel-graphics-compiler-src package. | 6 | Improve reproducibility for intel-graphics-compiler-src package. |
7 | needs to pass build path as environment variable to the build. | 7 | needs to pass build path as environment variable to the build. |
@@ -9,12 +9,13 @@ this only works on bison 3.7 onward, hence check for bison version | |||
9 | before adding the flags. | 9 | before adding the flags. |
10 | Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream] | 10 | Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream] |
11 | Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> | 11 | Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> |
12 | |||
12 | --- | 13 | --- |
13 | visa/CMakeLists.txt | 7 +++++-- | 14 | visa/CMakeLists.txt | 7 +++++-- |
14 | 1 file changed, 5 insertions(+), 2 deletions(-) | 15 | 1 file changed, 5 insertions(+), 2 deletions(-) |
15 | 16 | ||
16 | diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt | 17 | diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt |
17 | index 65dbb4934..8cd607a69 100644 | 18 | index 6be467587..930c386a6 100644 |
18 | --- a/visa/CMakeLists.txt | 19 | --- a/visa/CMakeLists.txt |
19 | +++ b/visa/CMakeLists.txt | 20 | +++ b/visa/CMakeLists.txt |
20 | @@ -123,8 +123,11 @@ endif() | 21 | @@ -123,8 +123,11 @@ endif() |
@@ -31,6 +32,3 @@ index 65dbb4934..8cd607a69 100644 | |||
31 | ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser) | 32 | ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser) |
32 | set(CISAScanner_dependencies) | 33 | set(CISAScanner_dependencies) |
33 | 34 | ||
34 | -- | ||
35 | 2.20.1 | ||
36 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch deleted file mode 100644 index 750a0494..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch +++ /dev/null | |||
@@ -1,143 +0,0 @@ | |||
1 | From c707d1e2244aec988bdd5d2a7473ef3a32a5bac7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Artem Gindinson <artem.gindinson@intel.com> | ||
3 | Date: Thu, 17 Nov 2022 18:51:03 +0000 | ||
4 | Subject: [PATCH] Disable opaque pointers in IGC stack for LLVM 15+ | ||
5 | |||
6 | While IGC is a long way from supporting opaque pointers, LLVM 15 has them | ||
7 | enabled by default. Enforce typed pointers explicitly within all LLVM | ||
8 | pipelines employed by our stack (unless CMake instructs otherwise). | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | IGC/BiFModule/CMakeLists.txt | 4 ++-- | ||
14 | IGC/CMakeLists.txt | 4 ++++ | ||
15 | IGC/Compiler/CodeGenContext.cpp | 3 +++ | ||
16 | IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | 4 ++++ | ||
17 | IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 4 ++-- | ||
18 | IGC/cmake/igc_llvm.cmake | 24 +++++++++++++++++++++++ | ||
19 | 6 files changed, 39 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt | ||
22 | index 60fc5cf8d7d..e87288ca6da 100644 | ||
23 | --- a/IGC/BiFModule/CMakeLists.txt | ||
24 | +++ b/IGC/BiFModule/CMakeLists.txt | ||
25 | @@ -251,7 +251,7 @@ function(igc_bif_build_bc) | ||
26 | add_custom_command( | ||
27 | OUTPUT "${_bcTempFilePath}" | ||
28 | COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${CMAKE_COMMAND}" -E make_directory "${_outBcFileDir}" | ||
29 | - COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "$<TARGET_FILE:clang-tool>" -cc1 -x cl -fblocks -fpreserve-vec3-type -opencl-builtins "-triple=${_archTriple}" -w -emit-llvm-bc -o "${_bcTempFilePath}" ${_pchFlags} ${_incFileFlags} ${_includeDirsFlags} ${_defineFlags} ${_options_DEFAULT} ${_options_CL} "${_srcFilePath}" | ||
30 | + COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "$<TARGET_FILE:clang-tool>" -cc1 ${IGC_LLVM_DEPENDENT_CLANG_FLAGS} -x cl -fblocks -fpreserve-vec3-type -opencl-builtins "-triple=${_archTriple}" -w -emit-llvm-bc -o "${_bcTempFilePath}" ${_pchFlags} ${_incFileFlags} ${_includeDirsFlags} ${_defineFlags} ${_options_DEFAULT} ${_options_CL} "${_srcFilePath}" | ||
31 | DEPENDS clang-tool ${_pchFilePath} ${_incFilePaths} "${_srcFilePath}" ${_dependencies} | ||
32 | COMMENT "BiF: \"${_outBcFileName}\": Compiling OpenCL source: \"${_srcFileName}\"" | ||
33 | ) | ||
34 | @@ -351,7 +351,7 @@ function(igc_bif_build_bc) | ||
35 | add_custom_command( | ||
36 | OUTPUT "${_bcTempFilePath}" | ||
37 | COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${CMAKE_COMMAND}" -E make_directory "${_outBcFileDir}" | ||
38 | - COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${bif-llvm-opt_exe}" -O2 -o "${_bcTempFilePath}" ${_options_DEFAULT} ${_options_OPT} ${_bcFiles} | ||
39 | + COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${bif-llvm-opt_exe}" -O2 -o "${_bcTempFilePath}" ${IGC_LLVM_DEPENDENT_OPT_ARGS} ${_options_DEFAULT} ${_options_OPT} ${_bcFiles} | ||
40 | DEPENDS ${_bcFiles} ${_dependencies} | ||
41 | COMMENT "BiF: \"${_outBcFileName}\": Optmizing output .bc." | ||
42 | ) | ||
43 | diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt | ||
44 | index 930a552121c..66ea2a3b5ca 100644 | ||
45 | --- a/IGC/CMakeLists.txt | ||
46 | +++ b/IGC/CMakeLists.txt | ||
47 | @@ -275,6 +275,10 @@ endif() | ||
48 | # Remove this condition after transition period is over | ||
49 | option(IGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC "[Experimental] Enable usage of Khronos SPIRV-LLVM-Translator in Scalar Compiler" OFF) | ||
50 | |||
51 | +# TODO: Change this flag to opt-out or remove completely once | ||
52 | +# opaque pointers are fully supported within the IGC stack. | ||
53 | +option(IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED "[Experimental] Allow usage of opaque pointers within LLVM transformations" OFF) | ||
54 | + | ||
55 | option(IGC_OPTION__ENABLE_LIT_TESTS "Enable lit testing for IGC compiler. May require additional tools like llvm lit and opt" OFF) | ||
56 | |||
57 | set(IGC_OPTION__BIF_SRC_OCL_DIR "${IGC_SOURCE_DIR}/BiFModule" | ||
58 | diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp | ||
59 | index 4abd6e4bf4a..0058571cd27 100644 | ||
60 | --- a/IGC/Compiler/CodeGenContext.cpp | ||
61 | +++ b/IGC/Compiler/CodeGenContext.cpp | ||
62 | @@ -231,6 +231,9 @@ namespace IGC | ||
63 | { | ||
64 | CreateResourceDimensionTypes(*this); | ||
65 | } | ||
66 | +#ifdef __IGC_OPAQUE_POINTERS_FORCE_DISABLED__ | ||
67 | + this->setOpaquePointers(false); | ||
68 | +#endif | ||
69 | } | ||
70 | |||
71 | void LLVMContextWrapper::AddRef() | ||
72 | diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | ||
73 | index ef0e5cacd96..c26bfcea74c 100644 | ||
74 | --- a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | ||
75 | +++ b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | ||
76 | @@ -1494,6 +1494,10 @@ namespace TC | ||
77 | optionsEx += " -debug-info-kind=line-tables-only -dwarf-version=4"; | ||
78 | } | ||
79 | |||
80 | +#ifdef __IGC_OPAQUE_POINTERS_FORCE_DISABLED__ | ||
81 | + optionsEx += " -no-opaque-pointers"; | ||
82 | +#endif | ||
83 | + | ||
84 | std::string extensionsFromInternalOptions = GetSubstring(pInternalOptions, "-cl-ext="); | ||
85 | |||
86 | std::string extensions; | ||
87 | diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | ||
88 | index 3181a13403c..6235fc1d21e 100644 | ||
89 | --- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | ||
90 | +++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | ||
91 | @@ -90,7 +90,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) | ||
92 | |||
93 | add_custom_command(OUTPUT "${BIF_CLANG_BC_PATH}" | ||
94 | COMMAND clang-tool -cc1 ${CMCL_INCLUDES} ${VC_INCLUDES} ${UTILS_HEADERS} | ||
95 | - ${EXTRA_CLANG_INCLUDES} ${EXTRA_CLANG_FLAGS} | ||
96 | + ${EXTRA_CLANG_INCLUDES} ${IGC_LLVM_DEPENDENT_CLANG_FLAGS} ${EXTRA_CLANG_FLAGS} | ||
97 | -x cl -cl-std=clc++ -triple=${SPIR_TARGET} | ||
98 | -O2 -disable-llvm-passes -emit-llvm-bc -o "${BIF_CLANG_BC_NAME}" ${CMCL_SRC} | ||
99 | COMMENT "vc_build_bif: Compiling CMCL source ${CMCL_SRC} to BC ${BIF_CLANG_BC_NAME}" | ||
100 | @@ -110,7 +110,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) | ||
101 | COMMENT "vc_build_bif: Translating CMCL builtins: ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_CMCL_BC_NAME}" | ||
102 | DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL}) | ||
103 | add_custom_command(OUTPUT ${BIF_OPT_BC_PATH} | ||
104 | - COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} | ||
105 | + COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} | ||
106 | COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}" | ||
107 | DEPENDS opt ${BIF_CMCL_BC_PATH}) | ||
108 | set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE) | ||
109 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake | ||
110 | index c0f74dcea14..96e3b0d1117 100644 | ||
111 | --- a/IGC/cmake/igc_llvm.cmake | ||
112 | +++ b/IGC/cmake/igc_llvm.cmake | ||
113 | @@ -69,6 +69,30 @@ list(TRANSFORM LLVM_INCLUDE_DIRS PREPEND "-I=" OUTPUT_VARIABLE LLVM_TABLEGEN_FLA | ||
114 | # Add major version definition for llvm wrapper. | ||
115 | add_compile_definitions(LLVM_VERSION_MAJOR=${LLVM_VERSION_MAJOR}) | ||
116 | |||
117 | +set(IGC_LLVM_DEPENDENT_CLANG_FLAGS "") | ||
118 | +set(IGC_LLVM_DEPENDENT_OPT_FLAGS "") | ||
119 | + | ||
120 | +# Disable the opaque pointers' usage explicitly, unless the block below deems that unnecessary | ||
121 | +set(IGC_OPAQUE_POINTERS_FORCE_DISABLED ON) | ||
122 | +if(IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED) | ||
123 | + if(LLVM_VERSION_MAJOR LESS 14) | ||
124 | + message(WARNING "IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED ignored: opaque pointers are not available prior to LLVM 14") | ||
125 | + endif() | ||
126 | + set(IGC_OPAQUE_POINTERS_FORCE_DISABLED OFF) | ||
127 | +elseif(LLVM_VERSION_MAJOR LESS 15) | ||
128 | + # Opaque pointers are either absent (LLVM <14) or disabled by default. No need to force-disable | ||
129 | + set(IGC_OPAQUE_POINTERS_FORCE_DISABLED OFF) | ||
130 | +endif(IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED) | ||
131 | + | ||
132 | +if(IGC_OPAQUE_POINTERS_FORCE_DISABLED) | ||
133 | + # Once we've figured out that explicit disabling is needed, propagate | ||
134 | + # corresponding options to all the in-tree calls of clang/opt tools. | ||
135 | + list(APPEND IGC_LLVM_DEPENDENT_CLANG_FLAGS "-no-opaque-pointers") | ||
136 | + list(APPEND IGC_LLVM_DEPENDENT_OPT_FLAGS "-opaque-pointers=0") | ||
137 | + # Also inform the preprocessor. | ||
138 | + add_compile_definitions(__IGC_OPAQUE_POINTERS_FORCE_DISABLED__) | ||
139 | +endif() | ||
140 | + | ||
141 | # Include LLVM headers as system ones. | ||
142 | # This will disable warnings on linux. | ||
143 | include_directories(SYSTEM ${LLVM_INCLUDE_DIRS}) | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch deleted file mode 100644 index a96be212..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | From d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Artem Gindinson <artem.gindinson@intel.com> | ||
3 | Date: Mon, 28 Nov 2022 14:33:44 +0000 | ||
4 | Subject: [PATCH] Explicitly cast pointers to `int` in BiFModule (LLVM 15) | ||
5 | |||
6 | Starting from version 15, Clang defaults to | ||
7 | `-Werror=int-conversion`. Add explicit casts in OpenCL C builtins' | ||
8 | code where necessary for LLVM 15 buildability. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | |||
13 | --- | ||
14 | IGC/BiFModule/Implementation/group.cl | 4 ++-- | ||
15 | IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl | 8 ++++---- | ||
16 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/IGC/BiFModule/Implementation/group.cl b/IGC/BiFModule/Implementation/group.cl | ||
19 | index dd6cfd6ba26..df9a2f64f4f 100644 | ||
20 | --- a/IGC/BiFModule/Implementation/group.cl | ||
21 | +++ b/IGC/BiFModule/Implementation/group.cl | ||
22 | @@ -1897,13 +1897,13 @@ void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageBlockWriteINTEL, _img2d_wo_v2 | ||
23 | global Img2d_wo* image, int2 coord, TYPE data) \ | ||
24 | { \ | ||
25 | int id = (int)__builtin_astype(image, __global void*); \ | ||
26 | - INTERNAL_FUNC(image, coord, data); \ | ||
27 | + INTERNAL_FUNC((int)image, coord, data); \ | ||
28 | } \ | ||
29 | void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageBlockWriteINTEL, _img2d_rw_v2i32_##TYPE_ABBR, )( \ | ||
30 | global Img2d_rw* image, int2 coord, TYPE data) \ | ||
31 | { \ | ||
32 | int id = (int)__builtin_astype(image, __global void*); \ | ||
33 | - INTERNAL_FUNC(image, coord, data); \ | ||
34 | + INTERNAL_FUNC((int)image, coord, data); \ | ||
35 | } | ||
36 | |||
37 | #ifdef cl_intel_subgroups_char | ||
38 | diff --git a/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl b/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl | ||
39 | index 062b4f3f49f..1d9d158e9c5 100644 | ||
40 | --- a/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl | ||
41 | +++ b/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl | ||
42 | @@ -379,7 +379,7 @@ INLINE int4 OVERLOADABLE read_imagei(read_only image1d_array_t image_array, samp | ||
43 | |||
44 | INLINE uint4 OVERLOADABLE read_imageui(read_only image1d_array_t image_array, sampler_t sampler, int2 coords) { | ||
45 | int id = (int)__builtin_astype(image_array, __global void*); | ||
46 | - int IDimage_array = __builtin_astype(image_array, __global void*); | ||
47 | + int IDimage_array = (int)__builtin_astype(image_array, __global void*); | ||
48 | int dt = __builtin_IB_get_image_array_size(IDimage_array); | ||
49 | float layer = clamp(rint((float)coords.y), 0.0f, (float)(--dt)); | ||
50 | if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP_TO_EDGE) | ||
51 | @@ -395,7 +395,7 @@ INLINE uint4 OVERLOADABLE read_imageui(read_only image1d_array_t image_array, sa | ||
52 | |||
53 | INLINE uint4 OVERLOADABLE read_imageui(read_only image1d_array_t image_array, sampler_t sampler, float2 coords) { | ||
54 | int id = (int)__builtin_astype(image_array, __global void*); | ||
55 | - int IDimage_array = __builtin_astype(image_array, __global void*); | ||
56 | + int IDimage_array = (int)__builtin_astype(image_array, __global void*); | ||
57 | int dt = __builtin_IB_get_image_array_size(IDimage_array); | ||
58 | float layer = clamp(rint(coords.y), 0.0f, (float)(--dt)); | ||
59 | if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP) | ||
60 | @@ -581,7 +581,7 @@ INLINE int4 OVERLOADABLE read_imagei(read_only image2d_array_t image_array, samp | ||
61 | |||
62 | INLINE uint4 OVERLOADABLE read_imageui(read_only image2d_array_t image_array, sampler_t sampler, int4 coords) { | ||
63 | int id = (int)__builtin_astype(image_array, __global void*); | ||
64 | - int IDimage_array = __builtin_astype(image_array, __global void*); | ||
65 | + int IDimage_array = (int)__builtin_astype(image_array, __global void*); | ||
66 | int dt = __builtin_IB_get_image_array_size(IDimage_array); | ||
67 | float layer = clamp(rint((float)coords.z), 0.0f, (float)(--dt)); | ||
68 | if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP_TO_EDGE) | ||
69 | @@ -597,7 +597,7 @@ INLINE uint4 OVERLOADABLE read_imageui(read_only image2d_array_t image_array, sa | ||
70 | |||
71 | INLINE uint4 OVERLOADABLE read_imageui(read_only image2d_array_t image_array, sampler_t sampler, float4 coords) { | ||
72 | int id = (int)__builtin_astype(image_array, __global void*); | ||
73 | - int IDimage_array = __builtin_astype(image_array, __global void*); | ||
74 | + int IDimage_array = (int)__builtin_astype(image_array, __global void*); | ||
75 | int dt = __builtin_IB_get_image_array_size(IDimage_array); | ||
76 | float layer = clamp(rint(coords.z), 0.0f, (float)(--dt)); | ||
77 | if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP) | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/e09e752949e7af0231884d1b11ea907e3e8b1611.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/e09e752949e7af0231884d1b11ea907e3e8b1611.patch deleted file mode 100644 index 55cb2a7d..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/e09e752949e7af0231884d1b11ea907e3e8b1611.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From e09e752949e7af0231884d1b11ea907e3e8b1611 Mon Sep 17 00:00:00 2001 | ||
2 | From: Artem Gindinson <artem.gindinson@intel.com> | ||
3 | Date: Fri, 18 Nov 2022 14:48:45 +0000 | ||
4 | Subject: [PATCH] Additional VC fix of pointer element type API usage | ||
5 | |||
6 | Quick fixup to the LLVM 15 buildability in the footsteps of commit | ||
7 | intel/intel-graphics-compiler@b86c1bf. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | |||
12 | --- | ||
13 | IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp | 8 ++++---- | ||
14 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp | ||
17 | index 363d622c24c..c047c545ac8 100644 | ||
18 | --- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp | ||
19 | +++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp | ||
20 | @@ -748,12 +748,12 @@ void GenXPredToSimdCF::insertIfGoto(SimdCFIfRegion &R) { | ||
21 | Mask->getName() + ".not"); | ||
22 | Value *EM = getEM(M); | ||
23 | Instruction *OldGotoEM = | ||
24 | - Builder.CreateLoad(EM->getType()->getPointerElementType(), EM, | ||
25 | + Builder.CreateLoad(IGCLLVM::getNonOpaquePtrEltTy(EM->getType()), EM, | ||
26 | false /*isVolatile*/, EM->getName()); | ||
27 | OldGotoEM->setDebugLoc(DL); | ||
28 | Value *GotoRMAddr = getRMAddr(Br->getSuccessor(0), SimdWidth); | ||
29 | Instruction *OldGotoRM = Builder.CreateLoad( | ||
30 | - GotoRMAddr->getType()->getPointerElementType(), GotoRMAddr, | ||
31 | + IGCLLVM::getNonOpaquePtrEltTy(GotoRMAddr->getType()), GotoRMAddr, | ||
32 | false /*isVolatile*/, GotoRMAddr->getName()); | ||
33 | OldGotoRM->setDebugLoc(DL); | ||
34 | Type *GotoTys[] = {OldGotoEM->getType(), OldGotoRM->getType()}; | ||
35 | @@ -798,12 +798,12 @@ void GenXPredToSimdCF::insertIfGoto(SimdCFIfRegion &R) { | ||
36 | AfterThens[&R] = AfterThen; | ||
37 | |||
38 | Builder.SetInsertPoint(AfterThen, AfterThen->begin()); | ||
39 | - auto *OldEM = Builder.CreateLoad(EM->getType()->getPointerElementType(), EM, | ||
40 | + auto *OldEM = Builder.CreateLoad(IGCLLVM::getNonOpaquePtrEltTy(EM->getType()), EM, | ||
41 | false /*isVolatile*/, EM->getName()); | ||
42 | OldEM->setDebugLoc(DL); | ||
43 | auto *RMAddr = getRMAddr(Br->getSuccessor(0), SimdWidth); | ||
44 | auto *RM = | ||
45 | - Builder.CreateLoad(RMAddr->getType()->getPointerElementType(), RMAddr, | ||
46 | + Builder.CreateLoad(IGCLLVM::getNonOpaquePtrEltTy(RMAddr->getType()), RMAddr, | ||
47 | false /*isVolatile*/, RMAddr->getName()); | ||
48 | RM->setDebugLoc(DL); | ||
49 | Type *Tys[] = {OldEM->getType(), RM->getType()}; | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb index 4cfe7133..96d828b6 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb | |||
@@ -8,23 +8,21 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc | |||
8 | file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \ | 8 | file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \ |
9 | file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" | 9 | file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.12812 \ | 11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.15985 \ |
12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ | 12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ |
13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \ | 13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \ |
14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \ | 14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \ |
15 | file://0003-Improve-Reproducibility-for-src-package.patch \ | 15 | file://0003-Improve-Reproducibility-for-src-package.patch \ |
16 | file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \ | 16 | file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \ |
17 | file://c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch \ | 17 | file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \ |
18 | file://d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch \ | ||
19 | file://e09e752949e7af0231884d1b11ea907e3e8b1611.patch \ | ||
20 | " | 18 | " |
21 | 19 | ||
22 | SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" | 20 | SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" |
23 | 21 | ||
24 | SRCREV_igc = "17eb3abbaa68a238f63d5d549e0a46cfeb71af80" | 22 | SRCREV_igc = "6cc111d262e1c3abcf4bc6b6d8a589ebf821a5c0" |
25 | SRCREV_vc = "dafb9926e5047a052ef5263dd4ec4fe5f178e5e0" | 23 | SRCREV_vc = "da892e1982b6c25b9a133f85b4ac97142d8a3def" |
26 | SRCREV_spirv-tools = "45dd184c790d6bfc78a5a74a10c37e888b1823fa" | 24 | SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" |
27 | SRCREV_spirv-headers = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78" | 25 | SRCREV_spirv-headers = "cca08c63cefa129d082abca0302adcb81610b465" |
28 | 26 | ||
29 | SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" | 27 | SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" |
30 | 28 | ||
@@ -33,15 +31,14 @@ export B | |||
33 | 31 | ||
34 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
35 | 33 | ||
36 | inherit cmake pkgconfig | 34 | inherit cmake pkgconfig qemu python3native |
37 | 35 | ||
38 | CXXFLAGS:append = " -Wno-error=nonnull" | 36 | CXXFLAGS:append = " -Wno-error=nonnull" |
39 | 37 | ||
40 | COMPATIBLE_HOST = '(x86_64).*-linux' | 38 | COMPATIBLE_HOST = '(x86_64).*-linux' |
41 | COMPATIBLE_HOST:libc-musl = "null" | 39 | COMPATIBLE_HOST:libc-musl = "null" |
42 | 40 | ||
43 | DEPENDS += " flex-native bison-native clang opencl-clang" | 41 | DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native" |
44 | DEPENDS:append:class-target = " clang-cross-x86_64 intel-graphics-compiler-native" | ||
45 | 42 | ||
46 | RDEPENDS:${PN} += "opencl-clang" | 43 | RDEPENDS:${PN} += "opencl-clang" |
47 | 44 | ||
@@ -50,27 +47,29 @@ PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV | |||
50 | 47 | ||
51 | EXTRA_OECMAKE = " \ | 48 | EXTRA_OECMAKE = " \ |
52 | -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \ | 49 | -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \ |
53 | -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ | ||
54 | -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \ | 50 | -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \ |
55 | -DIGC_OPTION__LLVM_MODE=Prebuilds \ | 51 | -DIGC_OPTION__LLVM_MODE=Prebuilds \ |
56 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | 52 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ |
57 | -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \ | 53 | -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \ |
58 | -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \ | 54 | -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \ |
55 | -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ | ||
59 | " | 56 | " |
60 | 57 | ||
61 | do_install:append:class-native () { | 58 | do_configure:prepend:class-target () { |
62 | install -d ${D}${bindir} | 59 | # Write out a qemu wrapper that will be used by cmake. |
63 | install ${B}/IGC/Release/elf_packager ${D}${bindir}/ | 60 | qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" |
64 | if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then | 61 | cat > ${WORKDIR}/qemuwrapper << EOF |
65 | install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/ | 62 | #!/bin/sh |
66 | install ${B}/IGC/Release/vcb ${D}${bindir}/ | 63 | $qemu_binary "\$@" |
67 | fi | 64 | EOF |
65 | chmod +x ${WORKDIR}/qemuwrapper | ||
68 | } | 66 | } |
69 | 67 | ||
70 | BBCLASSEXTEND = "native nativesdk" | ||
71 | |||
72 | UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$" | 68 | UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$" |
73 | 69 | ||
74 | FILES:${PN} += " \ | 70 | FILES:${PN} += " \ |
75 | ${libdir}/igc/NOTICES.txt \ | 71 | ${libdir}/igc/NOTICES.txt \ |
76 | " | 72 | " |
73 | |||
74 | # libigc.so contains buildpaths | ||
75 | INSANE_SKIP:${PN} += "buildpaths" | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch new file mode 100644 index 00000000..031a77c7 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 5aea653e611b59c70e529a1bd71885a509831557 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 1 Aug 2023 11:15:31 +0800 | ||
4 | Subject: [PATCH] cl_headers/CMakeLists.txt: use clang from native sysroot | ||
5 | |||
6 | Allow clang to be found in target sysroot for target builds and dont try | ||
7 | to compile cross binaries, we do that ourselves. | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-specific] | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 8 ++++---- | ||
13 | cl_headers/CMakeLists.txt | 2 +- | ||
14 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index 5864009..60ba39e 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -35,10 +35,10 @@ set(CMAKE_MODULE_PATH | ||
21 | |||
22 | include(CMakeFunctions) | ||
23 | |||
24 | -if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
25 | - include(CrossCompile) | ||
26 | - llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release) | ||
27 | -endif() | ||
28 | +#if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
29 | +# include(CrossCompile) | ||
30 | +# llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release) | ||
31 | +#endif() | ||
32 | |||
33 | if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | ||
34 | set(USE_PREBUILT_LLVM ON) | ||
35 | diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt | ||
36 | index 16cabb7..4423536 100644 | ||
37 | --- a/cl_headers/CMakeLists.txt | ||
38 | +++ b/cl_headers/CMakeLists.txt | ||
39 | @@ -1,6 +1,6 @@ | ||
40 | set(CL_HEADERS_LIB cl_headers) | ||
41 | if(USE_PREBUILT_LLVM) | ||
42 | - find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) | ||
43 | + find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR}) | ||
44 | else() | ||
45 | set(CLANG_COMMAND $<TARGET_FILE:clang>) | ||
46 | endif() | ||
47 | -- | ||
48 | 2.37.3 | ||
49 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch deleted file mode 100644 index 8df7e3ab..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 2 Apr 2020 08:59:20 +0800 | ||
4 | Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE | ||
5 | |||
6 | Use the value that has been passed by the user. | ||
7 | |||
8 | Upstream-Status: Submitted | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 5 ++++- | ||
12 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 6893e97..941b0ae 100644 | ||
16 | --- a/CMakeLists.txt | ||
17 | +++ b/CMakeLists.txt | ||
18 | @@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM) | ||
19 | set (COMPILE_OPTIONS_TD opencl_clang_options.td) | ||
20 | set (COMPILE_OPTIONS_INC opencl_clang_options.inc) | ||
21 | |||
22 | -set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
23 | +if(NOT DEFINED LLVM_TABLEGEN_EXE) | ||
24 | + set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
25 | +endif() | ||
26 | + | ||
27 | set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) | ||
28 | if(USE_PREBUILT_LLVM) | ||
29 | set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) | ||
30 | -- | ||
31 | 2.25.1 | ||
32 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch new file mode 100644 index 00000000..2f1814f8 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 43c806ef321b1f677a49d28c89fb7ffecf539c2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Creech <timothy.m.creech@intel.com> | ||
3 | Date: Wed, 28 Jun 2023 03:45:51 -0400 | ||
4 | Subject: [PATCH 2/2] Request native clang only when cross-compiling (#464) | ||
5 | |||
6 | * Request native clang only when cross-compiling | ||
7 | |||
8 | LLVM_USE_HOST_TOOLS may be set if LLVM is configured with | ||
9 | LLVM_OPTIMIZED_TABLEGEN, which does not necessarily indicate | ||
10 | cross-compilation or that clang will only execute on the target. | ||
11 | |||
12 | By checking that CMAKE_CROSSCOMPILING is set, we ensure that we only | ||
13 | build/use clang again if necessary for host execution. | ||
14 | |||
15 | * fixup: CMAKE_CROSSCOMPILING implies LLVM_USE_HOST_TOOLS | ||
16 | |||
17 | Co-authored-by: Wenju He <wenju.he@intel.com> | ||
18 | |||
19 | * fixup: also use CMAKE_CROSSCOMPILING in top-level CMakeLists.txt | ||
20 | |||
21 | --------- | ||
22 | |||
23 | Co-authored-by: Wenju He <wenju.he@intel.com> | ||
24 | |||
25 | Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/53843eee13cfb2357919ee02714a43bef1af0f86] | ||
26 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
27 | --- | ||
28 | CMakeLists.txt | 2 +- | ||
29 | cl_headers/CMakeLists.txt | 2 +- | ||
30 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
31 | |||
32 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
33 | index e772de9..5864009 100644 | ||
34 | --- a/CMakeLists.txt | ||
35 | +++ b/CMakeLists.txt | ||
36 | @@ -35,7 +35,7 @@ set(CMAKE_MODULE_PATH | ||
37 | |||
38 | include(CMakeFunctions) | ||
39 | |||
40 | -if(LLVM_USE_HOST_TOOLS AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
41 | +if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
42 | include(CrossCompile) | ||
43 | llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release) | ||
44 | endif() | ||
45 | diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt | ||
46 | index 18296c2..16cabb7 100644 | ||
47 | --- a/cl_headers/CMakeLists.txt | ||
48 | +++ b/cl_headers/CMakeLists.txt | ||
49 | @@ -4,7 +4,7 @@ if(USE_PREBUILT_LLVM) | ||
50 | else() | ||
51 | set(CLANG_COMMAND $<TARGET_FILE:clang>) | ||
52 | endif() | ||
53 | -if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL) | ||
54 | +if(CMAKE_CROSSCOMPILING AND NOT OPENCL_CLANG_BUILD_EXTERNAL) | ||
55 | build_native_tool(clang CLANG_COMMAND) | ||
56 | endif() | ||
57 | |||
58 | -- | ||
59 | 2.37.3 | ||
60 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc index 0886e43b..31a3fb21 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc | |||
@@ -6,6 +6,8 @@ LICENSE = "NCSA" | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \ | 8 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \ |
9 | file://0002-Request-native-clang-only-when-cross-compiling-464.patch \ | ||
10 | file://0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch \ | ||
9 | " | 11 | " |
10 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
11 | 13 | ||
@@ -16,4 +18,17 @@ DEPENDS:append:class-target = " opencl-clang-native" | |||
16 | COMPATIBLE_HOST = '(x86_64).*-linux' | 18 | COMPATIBLE_HOST = '(x86_64).*-linux' |
17 | COMPATIBLE_HOST:libc-musl = "null" | 19 | COMPATIBLE_HOST:libc-musl = "null" |
18 | 20 | ||
21 | DEPENDS += " spirv-llvm-translator" | ||
22 | |||
23 | EXTRA_OECMAKE += "\ | ||
24 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
25 | -DCMAKE_SKIP_RPATH=TRUE \ | ||
26 | -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ | ||
27 | " | ||
28 | |||
29 | do_install:append:class-native() { | ||
30 | install -d ${D}${bindir} | ||
31 | install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ | ||
32 | } | ||
33 | |||
19 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb index a590b38d..7e56af75 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb | |||
@@ -1,20 +1,5 @@ | |||
1 | require opencl-clang.inc | 1 | require opencl-clang.inc |
2 | 2 | ||
3 | SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ | 3 | SRCREV = "980f1691c5babcf824ee10375a04a0d0c5d7d44a" |
4 | " | ||
5 | SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f" | ||
6 | 4 | ||
7 | BRANCH = "ocl-open-140" | 5 | BRANCH = "ocl-open-140" |
8 | |||
9 | DEPENDS += " spirv-llvm-translator" | ||
10 | |||
11 | EXTRA_OECMAKE += "\ | ||
12 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
13 | -DCMAKE_SKIP_RPATH=TRUE \ | ||
14 | -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ | ||
15 | " | ||
16 | |||
17 | do_install:append:class-native() { | ||
18 | install -d ${D}${bindir} | ||
19 | install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/ | ||
20 | } | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb index 217158e9..e946c31c 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb | |||
@@ -1,18 +1,5 @@ | |||
1 | require opencl-clang.inc | 1 | require opencl-clang.inc |
2 | 2 | ||
3 | SRCREV = "c78c1f884ffe8b40e1681a90ebde1a919c08ddb1" | 3 | SRCREV = "60fd799cc58755c16d951f9ebfde6d0f9b8554dd" |
4 | 4 | ||
5 | BRANCH = "ocl-open-150" | 5 | BRANCH = "ocl-open-150" |
6 | |||
7 | DEPENDS += " spirv-llvm-translator" | ||
8 | |||
9 | EXTRA_OECMAKE += "\ | ||
10 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
11 | -DCMAKE_SKIP_RPATH=TRUE \ | ||
12 | -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \ | ||
13 | " | ||
14 | |||
15 | do_install:append:class-native() { | ||
16 | install -d ${D}${bindir} | ||
17 | install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/ | ||
18 | } | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb deleted file mode 100644 index 4329fbdc..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | SUMMARY = "VC Intrinsics" | ||
2 | DESCRIPTION = "VC Intrinsics project contains a set of new intrinsics on \ | ||
3 | top of core LLVM IR instructions that represent SIMD semantics of a program \ | ||
4 | targeting GPU" | ||
5 | |||
6 | LICENSE = "MIT" | ||
7 | LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc" | ||
8 | |||
9 | SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;branch=master \ | ||
10 | " | ||
11 | SRCREV = "b2c98d943986a27016bc735b84ed1655943ef749" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | PE = "1" | ||
16 | PV .= "+git${SRCPV}" | ||
17 | |||
18 | inherit cmake | ||
19 | |||
20 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
21 | COMPATIBLE_HOST:libc-musl = "null" | ||
22 | |||
23 | DEPENDS += " clang" | ||
24 | |||
25 | EXTRA_OECMAKE = "-DLLVM_DIR=${STAGING_LIBDIR}" | ||
26 | |||
27 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.2.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb index b8547cc5..70177c28 100644 --- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.2.0.bb +++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb | |||
@@ -5,9 +5,9 @@ environment, performs static model analysis, and adjusts deep \ | |||
5 | learning models for optimal execution on end-point target devices." | 5 | learning models for optimal execution on end-point target devices." |
6 | HOMEPAGE = "https://01.org/openvinotoolkit" | 6 | HOMEPAGE = "https://01.org/openvinotoolkit" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/2;lfs=0 \ | 8 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/0;lfs=0 \ |
9 | " | 9 | " |
10 | SRCREV = "bc8582469e7897be0c108e7de48fac79109dfb88" | 10 | SRCREV = "34caeefd07800b59065345d651949efbe8ab6649" |
11 | 11 | ||
12 | LICENSE = "Apache-2.0" | 12 | LICENSE = "Apache-2.0" |
13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
@@ -20,13 +20,14 @@ inherit setuptools3 | |||
20 | SETUPTOOLS_SETUP_PATH = "${WORKDIR}/git/tools/mo" | 20 | SETUPTOOLS_SETUP_PATH = "${WORKDIR}/git/tools/mo" |
21 | 21 | ||
22 | RDEPENDS:${PN} += " \ | 22 | RDEPENDS:${PN} += " \ |
23 | python3-numpy \ | ||
24 | python3-protobuf \ | ||
25 | python3-defusedxml \ | 23 | python3-defusedxml \ |
24 | python3-fastjsonschema \ | ||
26 | python3-networkx \ | 25 | python3-networkx \ |
26 | python3-numpy \ | ||
27 | python3-protobuf \ | ||
27 | python3-requests \ | 28 | python3-requests \ |
28 | python3-urllib3 \ | 29 | python3-urllib3 \ |
29 | bash \ | 30 | bash \ |
30 | " | 31 | " |
31 | 32 | ||
32 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 33 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$" |
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb index e0d6b91e..bdf32576 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb | |||
@@ -10,11 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | |||
10 | 10 | ||
11 | COMPATIBLE_HOST:libc-musl = "null" | 11 | COMPATIBLE_HOST:libc-musl = "null" |
12 | 12 | ||
13 | inherit cmake systemd features_check | 13 | inherit cmake systemd features_check python3native |
14 | 14 | ||
15 | DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native" | 15 | DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native" |
16 | |||
17 | EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" | ||
18 | 16 | ||
19 | # Enable either connman or networkmanager or none but not both. | 17 | # Enable either connman or networkmanager or none but not both. |
20 | PACKAGECONFIG ??= "connman" | 18 | PACKAGECONFIG ??= "connman" |
@@ -31,9 +29,10 @@ SYSTEMD_SERVICE:${PN} = "lms.service" | |||
31 | 29 | ||
32 | SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ | 30 | SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ |
33 | " | 31 | " |
34 | SRCREV = "7f4e295da5df69ae5424df18805af761c6601545" | 32 | SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47" |
35 | 33 | ||
36 | do_install:append() { | 34 | do_install:append() { |
35 | install -d ${D}${sysconfdir}/lms | ||
37 | install -d ${D}${systemd_system_unitdir} | 36 | install -d ${D}${systemd_system_unitdir} |
38 | install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} | 37 | install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} |
39 | install -d ${D}${sysconfdir}/udev/rules.d | 38 | install -d ${D}${sysconfdir}/udev/rules.d |
@@ -42,5 +41,4 @@ do_install:append() { | |||
42 | 41 | ||
43 | RDEPENDS:${PN} += "ace" | 42 | RDEPENDS:${PN} += "ace" |
44 | 43 | ||
45 | # This CVE is for Lan Management System software and not this lms. | 44 | CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System." |
46 | CVE_CHECK_IGNORE += "CVE-2018-1000535" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch new file mode 100644 index 00000000..270cc84d --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Mon, 11 Mar 2024 13:13:32 +0800 | ||
4 | Subject: [PATCH] Makefile: Fix build Issue | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | In case build directory is different from source, make sure make is able to find the correct input files. | ||
10 | |||
11 | Fixes: | ||
12 | | dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml | ||
13 | | glib-compile-resources --generate-source thermald-resource.gresource.xml | ||
14 | | Failed to open file “thermald-resource.gresource.xml”: No such file or directory | ||
15 | |||
16 | |||
17 | Upstream-Status: Submitted | ||
18 | https://github.com/intel/thermal_daemon/pull/436 | ||
19 | |||
20 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
21 | --- | ||
22 | Makefile.am | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/Makefile.am b/Makefile.am | ||
26 | index a0c051a..772e280 100644 | ||
27 | --- a/Makefile.am | ||
28 | +++ b/Makefile.am | ||
29 | @@ -95,6 +95,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml | ||
30 | $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $< | ||
31 | |||
32 | thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml | ||
33 | - $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml | ||
34 | + $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $< | ||
35 | |||
36 | CLEANFILES = $(BUILT_SOURCES) | ||
37 | -- | ||
38 | 2.34.1 | ||
39 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.1.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb index 2d2562eb..df242cdf 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb | |||
@@ -7,13 +7,16 @@ compensation using available cooling methods." | |||
7 | HOMEPAGE = "https://github.com/01org/thermal_daemon" | 7 | HOMEPAGE = "https://github.com/01org/thermal_daemon" |
8 | 8 | ||
9 | DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev" | 9 | DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev" |
10 | DEPENDS += "autoconf-archive-native" | ||
11 | |||
10 | LICENSE = "GPL-2.0-only" | 12 | LICENSE = "GPL-2.0-only" |
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" |
12 | 14 | ||
13 | SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ | 15 | SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ |
16 | file://0001-Makefile-Fix-build-Issue.patch \ | ||
14 | " | 17 | " |
15 | 18 | ||
16 | SRCREV = "9366c4e9b1850c4a1336682f7f16d9c1a8b03682" | 19 | SRCREV = "3990ce2391e5c07293758c056e09e4f2453691b4" |
17 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
18 | 21 | ||
19 | inherit pkgconfig autotools systemd gtk-doc | 22 | inherit pkgconfig autotools systemd gtk-doc |
@@ -28,7 +31,7 @@ EXTRA_OECONF = " \ | |||
28 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | 31 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ |
29 | " | 32 | " |
30 | 33 | ||
31 | FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" | 34 | FILES:${PN} += "${datadir}/dbus-1" |
32 | 35 | ||
33 | SYSTEMD_SERVICE:${PN} = "thermald.service" | 36 | SYSTEMD_SERVICE:${PN} = "thermald.service" |
34 | 37 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch new file mode 100644 index 00000000..4d583657 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From deccc0c69c2c8759c52885be8bdda54d3cee481c Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Sun, 11 Dec 2022 22:34:15 +0800 | ||
4 | Subject: [PATCH] Add print function to print test run status in ptest format | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE ptest specific] | ||
7 | |||
8 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
9 | --- | ||
10 | run_tests.py | 16 ++++++++++++++++ | ||
11 | 1 file changed, 16 insertions(+) | ||
12 | |||
13 | diff --git a/run_tests.py b/run_tests.py | ||
14 | index 1cd796dd..e3ffd1ab 100755 | ||
15 | --- a/run_tests.py | ||
16 | +++ b/run_tests.py | ||
17 | @@ -327,6 +327,9 @@ def run_test(testname, host, target): | ||
18 | else: | ||
19 | ispc_exe_rel = add_prefix(host.ispc_cmd, host, target) | ||
20 | |||
21 | + # to reslove the error '.rodata' can not be used when making a PIE object | ||
22 | + ispc_exe_rel = ispc_exe_rel + " --pic" | ||
23 | + | ||
24 | # is this a test to make sure an error is issued? | ||
25 | want_error = (filename.find("tests_errors") != -1) | ||
26 | if want_error == True: | ||
27 | @@ -795,6 +798,17 @@ def check_compiler_exists(compiler_exe): | ||
28 | return | ||
29 | error("missing the required compiler: %s \n" % compiler_exe, 1) | ||
30 | |||
31 | +def print_test_run_status(results): | ||
32 | + for fstatus in results: | ||
33 | + if (fstatus[1] == Status.Success): | ||
34 | + print( "%s: %s" % ("PASS", fstatus[0])) | ||
35 | + elif (fstatus[1] == Status.Compfail): | ||
36 | + print( "%s: %s" % ("FAIL", fstatus[0])) | ||
37 | + elif (fstatus[1] == Status.Runfail): | ||
38 | + print( "%s: %s" % ("FAIL", fstatus[0])) | ||
39 | + elif (fstatus[1] == Status.Skip): | ||
40 | + print( "%s: %s" % ("SKIP", fstatus[0])) | ||
41 | + | ||
42 | def print_result(status, results, s, run_tests_log, csv): | ||
43 | title = StatusStr[status] | ||
44 | file_list = [fname for fname, fstatus in results if status == fstatus] | ||
45 | @@ -938,6 +952,8 @@ def run_tests(options1, args, print_version): | ||
46 | pass_rate = -1 | ||
47 | print_debug("PASSRATE (%d/%d) = %d%% \n\n" % (len(run_succeed_files), total_tests_executed, pass_rate), s, run_tests_log) | ||
48 | |||
49 | + print_test_run_status(results) | ||
50 | + | ||
51 | for status in Status: | ||
52 | print_result(status, results, s, run_tests_log, options.csv) | ||
53 | fails = [status != Status.Compfail and status != Status.Runfail for _, status in results] | ||
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch index e7bb599e..b0a76ff9 100644 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 139b94a7fb72114c31a2a6ab3f7e6024b4a738ec Mon Sep 17 00:00:00 2001 | 1 | From 7beff95c11071170eb27b6fa7d0cc77588caee8e Mon Sep 17 00:00:00 2001 |
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | 2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> |
3 | Date: Tue, 26 Jul 2022 15:25:10 +0800 | 3 | Date: Tue, 26 Jul 2022 15:25:10 +0800 |
4 | Subject: [PATCH] Fix QA Issues | 4 | Subject: [PATCH] Fix QA Issues |
@@ -8,16 +8,15 @@ Stop ispc from inserting host file path in generated headers which leads to repr | |||
8 | Upstream-Status: Inappropriate [OE build specific] | 8 | Upstream-Status: Inappropriate [OE build specific] |
9 | 9 | ||
10 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | 10 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | src/module.cpp | 4 ++-- | 12 | src/module.cpp | 4 ++-- |
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 14 | ||
16 | diff --git a/src/module.cpp b/src/module.cpp | 15 | diff --git a/src/module.cpp b/src/module.cpp |
17 | index 58a2ae83..82673052 100644 | 16 | index e2084d2e..e2626865 100644 |
18 | --- a/src/module.cpp | 17 | --- a/src/module.cpp |
19 | +++ b/src/module.cpp | 18 | +++ b/src/module.cpp |
20 | @@ -2105,7 +2105,7 @@ bool Module::writeHeader(const char *fn) { | 19 | @@ -2555,7 +2555,7 @@ bool Module::writeHeader(const char *fn) { |
21 | perror("fopen"); | 20 | perror("fopen"); |
22 | return false; | 21 | return false; |
23 | } | 22 | } |
@@ -26,7 +25,7 @@ index 58a2ae83..82673052 100644 | |||
26 | fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n"); | 25 | fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n"); |
27 | 26 | ||
28 | // Create a nice guard string from the filename, turning any | 27 | // Create a nice guard string from the filename, turning any |
29 | @@ -2219,7 +2219,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) { | 28 | @@ -2677,7 +2677,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) { |
30 | FILE *f = DHI->file; | 29 | FILE *f = DHI->file; |
31 | 30 | ||
32 | if (DHI->EmitFrontMatter) { | 31 | if (DHI->EmitFrontMatter) { |
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch index a13ade9f..f452dc50 100644 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 493e886d6dae2ed7bdc12ed03f717ee0e98dfe09 Mon Sep 17 00:00:00 2001 | 1 | From 16a2c22339287122d2c25d8bb33a5a51b4e6ee51 Mon Sep 17 00:00:00 2001 |
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
3 | Date: Thu, 24 Feb 2022 20:01:11 +0530 | 3 | Date: Thu, 24 Feb 2022 20:01:11 +0530 |
4 | Subject: [PATCH] cmake: don't build for 32-bit targets | 4 | Subject: [PATCH] cmake: don't build for 32-bit targets |
@@ -16,14 +16,14 @@ Upstream-Status: Inappropriate | |||
16 | 16 | ||
17 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 17 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
18 | --- | 18 | --- |
19 | cmake/GenerateBuiltins.cmake | 8 ++++---- | 19 | cmake/GenerateBuiltins.cmake | 6 +++--- |
20 | 1 file changed, 4 insertions(+), 4 deletions(-) | 20 | 1 file changed, 3 insertions(+), 3 deletions(-) |
21 | 21 | ||
22 | diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake | 22 | diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake |
23 | index fa228247..7adc7e52 100644 | 23 | index f84494ed..d90cb1ec 100644 |
24 | --- a/cmake/GenerateBuiltins.cmake | 24 | --- a/cmake/GenerateBuiltins.cmake |
25 | +++ b/cmake/GenerateBuiltins.cmake | 25 | +++ b/cmake/GenerateBuiltins.cmake |
26 | @@ -272,7 +272,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi | 26 | @@ -253,7 +253,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi |
27 | # In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up | 27 | # In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up |
28 | # by clang by default. So the following line adds such path explicitly. If this path doesn't exist and | 28 | # by clang by default. So the following line adds such path explicitly. If this path doesn't exist and |
29 | # the headers can be found in other locations, this should not be a problem. | 29 | # the headers can be found in other locations, this should not be a problem. |
@@ -32,7 +32,7 @@ index fa228247..7adc7e52 100644 | |||
32 | endif() | 32 | endif() |
33 | endif() | 33 | endif() |
34 | 34 | ||
35 | @@ -354,7 +354,7 @@ function (generate_target_builtins resultList) | 35 | @@ -339,7 +339,7 @@ function (generate_target_builtins resultList) |
36 | set(regular_targets ${ARGN}) | 36 | set(regular_targets ${ARGN}) |
37 | list(FILTER regular_targets EXCLUDE REGEX wasm) | 37 | list(FILTER regular_targets EXCLUDE REGEX wasm) |
38 | foreach (ispc_target ${regular_targets}) | 38 | foreach (ispc_target ${regular_targets}) |
@@ -41,24 +41,12 @@ index fa228247..7adc7e52 100644 | |||
41 | foreach (os_name ${TARGET_OS_LIST_FOR_LL}) | 41 | foreach (os_name ${TARGET_OS_LIST_FOR_LL}) |
42 | target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit}) | 42 | target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit}) |
43 | list(APPEND tmpList ${output${os_name}${bit}}) | 43 | list(APPEND tmpList ${output${os_name}${bit}}) |
44 | @@ -415,7 +415,7 @@ function (generate_common_builtins resultList) | 44 | @@ -405,7 +405,7 @@ function (generate_common_builtins resultList) |
45 | endif() | 45 | endif() |
46 | 46 | ||
47 | message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}") | 47 | message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}") |
48 | - foreach (bit 32 64) | 48 | - foreach (bit 32 64) |
49 | + foreach (bit 64) | 49 | + foreach (bit 64) |
50 | foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web") | 50 | foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web") |
51 | foreach (arch "x86" "arm" "wasm32") | 51 | foreach (arch "x86" "arm" "wasm") |
52 | builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch}) | 52 | builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch}) |
53 | @@ -428,7 +428,7 @@ function (generate_common_builtins resultList) | ||
54 | endforeach() | ||
55 | endforeach() | ||
56 | if (XE_ENABLED) | ||
57 | - foreach (bit 32 64) | ||
58 | + foreach (bit 64) | ||
59 | builtin_xe_to_cpp(${bit} res_xe_${bit}) | ||
60 | list(APPEND tmpList ${res_xe_${bit}} ) | ||
61 | if(MSVC) | ||
62 | -- | ||
63 | 2.17.1 | ||
64 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest new file mode 100644 index 00000000..77d13bb4 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest | |||
@@ -0,0 +1,2 @@ | |||
1 | #!/bin/sh | ||
2 | python3 run_tests.py | ||
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.18.0.bb b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb index 6a2e6059..ed8df859 100644 --- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.18.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb | |||
@@ -5,25 +5,29 @@ HOMEPAGE = "https://github.com/ispc/ispc" | |||
5 | 5 | ||
6 | LICENSE = "BSD-3-Clause & Apache-2.0-with-LLVM-exception" | 6 | LICENSE = "BSD-3-Clause & Apache-2.0-with-LLVM-exception" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \ |
8 | file://third-party-programs.txt;md5=3cd6f8a7c3bd9d2bb898fcb27c75221a" | 8 | file://third-party-programs.txt;md5=2061218c7be521556719c8b504bf9ddd" |
9 | 9 | ||
10 | inherit cmake python3native | 10 | inherit cmake python3native ptest |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \ | 14 | SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \ |
15 | file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \ | ||
16 | file://0002-cmake-don-t-build-for-32-bit-targets.patch \ | 15 | file://0002-cmake-don-t-build-for-32-bit-targets.patch \ |
17 | file://0001-Fix-QA-Issues.patch \ | 16 | file://0001-Fix-QA-Issues.patch \ |
18 | file://6a1b2ffae0cc12467838bc671e3b089924de90a6.patch \ | 17 | file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \ |
19 | file://ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch \ | 18 | file://run-ptest \ |
20 | " | 19 | " |
21 | SRCREV = "f7ec3aa173c816377c215d83196b5c7c3a88db1c" | 20 | |
21 | SRCREV = "bcb2cf896c00f9a802a11cbf291ef6e44b205416" | ||
22 | 22 | ||
23 | COMPATIBLE_HOST = '(x86_64).*-linux' | 23 | COMPATIBLE_HOST = '(x86_64).*-linux' |
24 | 24 | ||
25 | DEPENDS += " clang-native bison-native flex-native" | 25 | DEPENDS += " clang-native bison-native flex-native" |
26 | RDEPENDS:${PN} += " clang-libllvm clang clang-libclang-cpp" | 26 | DEPENDS:append:class-target = " clang" |
27 | RDEPENDS:${PN}-ptest += " python3-multiprocessing" | ||
28 | |||
29 | PACKAGECONFIG ??= "tbb" | ||
30 | PACKAGECONFIG[tbb] = "-DISPCRT_BUILD_TASK_MODEL=TBB, -DISPCRT_BUILD_TASK_MODEL=OpenMP, tbb" | ||
27 | 31 | ||
28 | YFLAGS='-d -t -v -y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' | 32 | YFLAGS='-d -t -v -y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' |
29 | 33 | ||
@@ -32,18 +36,29 @@ do_configure:prepend() { | |||
32 | sed -i -e 's#\${FLEX_EXECUTABLE}.*#\${FLEX_EXECUTABLE} \-L #g' ${S}/CMakeLists.txt | 36 | sed -i -e 's#\${FLEX_EXECUTABLE}.*#\${FLEX_EXECUTABLE} \-L #g' ${S}/CMakeLists.txt |
33 | } | 37 | } |
34 | 38 | ||
39 | do_install_ptest() { | ||
40 | cp -rf ${S}/run_tests.py ${D}${PTEST_PATH} | ||
41 | cp -rf ${S}/common.py ${D}${PTEST_PATH} | ||
42 | cp -rf ${S}/tests ${D}${PTEST_PATH} | ||
43 | cp -rf ${S}/test_static.isph ${D}${PTEST_PATH} | ||
44 | cp -rf ${S}/fail_db.txt ${D}${PTEST_PATH} | ||
45 | cp -rf ${S}/test_static.cpp ${D}${PTEST_PATH} | ||
46 | } | ||
47 | |||
35 | EXTRA_OECMAKE += " \ | 48 | EXTRA_OECMAKE += " \ |
36 | -DISPC_INCLUDE_TESTS=OFF \ | 49 | -DISPC_INCLUDE_TESTS=OFF \ |
37 | -DISPC_INCLUDE_EXAMPLES=OFF \ | 50 | -DISPC_INCLUDE_EXAMPLES=OFF \ |
38 | -DISPC_NO_DUMPS=ON \ | ||
39 | -DARM_ENABLED=OFF \ | 51 | -DARM_ENABLED=OFF \ |
40 | -DISPC_CROSS=ON \ | 52 | -DISPC_CROSS=ON \ |
41 | -DISPC_ANDROID_TARGET=OFF \ | 53 | -DISPC_ANDROID_TARGET=OFF \ |
42 | -DISPC_FREEBSD_TARGET=OFF \ | 54 | -DISPC_FREEBSD_TARGET=OFF \ |
43 | -DISPC_WINDOWS_TARGET=OFF \ | 55 | -DISPC_WINDOWS_TARGET=OFF \ |
44 | -DISPC_IOS_TARGET=OFF \ | 56 | -DISPC_IOS_TARGET=OFF \ |
45 | -DISPC_PS4_TARGET=OFF \ | 57 | -DISPC_PS_TARGET=OFF \ |
46 | -DSYSROOT_DIR=${STAGING_DIR_NATIVE} \ | 58 | -DSYSROOT_DIR=${STAGING_DIR} \ |
59 | -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \ | ||
60 | -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \ | ||
61 | -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \ | ||
47 | " | 62 | " |
48 | 63 | ||
49 | BBCLASSEXTEND = "native nativesdk" | 64 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb index a63c30bc..8bade9f4 100644 --- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb +++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master" |
7 | SRCREV = "bb7fff05b801e26c3d7858e03e509d1089914d59" | 7 | SRCREV = "1685d01497428ca4d8b99200972b64685424d5c9" |
8 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
9 | 9 | ||
10 | inherit cmake | 10 | inherit cmake |
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb deleted file mode 100644 index b9d4fdf6..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | SUMMARY = "Intel® oneAPI DPC++/C++ Compiler & Intel® C++ Compiler Classic runtime common files" | ||
2 | DESCRIPTION = "Intel® C++ Compiler Classic generates applications\ | ||
3 | that can run on Intel® 64 architecture and the IA-32 architecture.\ | ||
4 | Intel® oneAPI Data Parallel C++ (DPC++) is an open alternative \ | ||
5 | to single-architecture proprietary languages. It allows developers to reuse \ | ||
6 | code across hardware targets (CPUs and accelerators such as GPUs and FPGAs) \ | ||
7 | and also perform custom tuning for a specific accelerator." | ||
8 | HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html" | ||
9 | |||
10 | LICENSE="EULA" | ||
11 | |||
12 | LIC_FILES_CHKSUM = " \ | ||
13 | file://opt/intel/oneapi/lib/licensing/compiler/Intel%20Developer%20Tools%20EULA;md5=7bfc91523de2e84e7131d0eacf2827d4 \ | ||
14 | file://opt/intel/oneapi/lib/licensing/compiler/openmp/third-party-programs.txt;md5=da72b17a4a1efef54faf14df4a703282 \ | ||
15 | file://opt/intel/oneapi/lib/licensing/compiler/c/third-party-programs.txt;md5=3414f5649b09160ade46d4981f3452fe \ | ||
16 | file://opt/intel/oneapi/lib/licensing/opencl/EULA.txt;md5=7bfc91523de2e84e7131d0eacf2827d4 \ | ||
17 | file://opt/intel/oneapi/lib/licensing/opencl/TBB_TPP.txt;md5=0a69156543e3e115c673c6041b6aee92 \ | ||
18 | file://opt/intel/oneapi/lib/licensing/opencl/redist.txt;md5=32fb3b7d1c0a92ea577fe2e4b0dfa663 \ | ||
19 | file://opt/intel/oneapi/lib/licensing/opencl/third-party-programs.txt;md5=c660b8b0891e780a62da6a198e80e9ac \ | ||
20 | " | ||
21 | |||
22 | SRC_URI = " \ | ||
23 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-${PV}_amd64.deb;subdir=${BPN};name=runtime-compilers \ | ||
24 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-common-${PV}_all.deb;subdir=${BPN};name=common-compilers \ | ||
25 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-${PV}_amd64.deb;subdir=${BPN};name=runtime-dpcpp-cpp \ | ||
26 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-common-${PV}_all.deb;subdir=${BPN};name=common-dpcpp-cpp \ | ||
27 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-${PV}_amd64.deb;subdir=${BPN};name=runtime-openmp \ | ||
28 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-common-${PV}_all.deb;subdir=${BPN};name=common-openmp \ | ||
29 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-opencl-${PV}_amd64.deb;subdir=${BPN};name=runtime-opencl \ | ||
30 | " | ||
31 | |||
32 | SRC_URI[runtime-compilers.sha256sum] = "8951fd8a0946095609f0ef7bb2b51c698fc0315455a76d268a54851936c07db9" | ||
33 | SRC_URI[common-compilers.sha256sum] = "c592482f68b131fff0623fdc978c592950f02d7f35f6795587e93a28fe1d3c31" | ||
34 | SRC_URI[runtime-dpcpp-cpp.sha256sum] = "9e26b9c5321281d829d62542c22552182d00255ebc2f8a6e179b95515c63c24d" | ||
35 | SRC_URI[common-dpcpp-cpp.sha256sum] = "9cd0957a75f5ad45b208f2c1c8ee2aa032e335ada9193ca69f8ac5a7cb548d02" | ||
36 | SRC_URI[runtime-openmp.sha256sum] = "86fb0d6e3a34217cc30594e9f21e89070425c6c56773edae4d5a86730239c171" | ||
37 | SRC_URI[common-openmp.sha256sum] = "5bd2fc7a1605545fc8536ec0e8d80c982f1feb7dc6eed5b45adf3cd0370e0a98" | ||
38 | SRC_URI[runtime-opencl.sha256sum] = "65d73c23f07c2419b8a1d22043b73346f25b387d3ec07b48f08177de1835a360" | ||
39 | |||
40 | S = "${WORKDIR}/${BPN}" | ||
41 | |||
42 | inherit bin_package update-alternatives | ||
43 | |||
44 | ALTERNATIVE:${PN} = "Intel_FPGA_SSG_Emulator.icd" | ||
45 | ALTERNATIVE_LINK_NAME[Intel_FPGA_SSG_Emulator.icd] = "/etc/OpenCL/vendors/intel64-fpgaemu.icd" | ||
46 | ALTERNATIVE_TARGET[Intel_FPGA_SSG_Emulator.icd] = "/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd" | ||
47 | ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233" | ||
48 | |||
49 | INHIBIT_PACKAGE_STRIP = "1" | ||
50 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
51 | |||
52 | RDEPENDS:${PN} += "perl elfutils ocl-icd level-zero-loader zlib tbb libelf setup-intel-oneapi-env" | ||
53 | INSANE_SKIP:${PN} += "textrel dev-so" | ||
54 | |||
55 | # The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6 | ||
56 | do_install:append () { | ||
57 | rm -f ${D}/opt/intel/oneapi/lib/libomptarget.rtl.x86_64.so | ||
58 | echo "/opt/intel/oneapi/lib/emu/libintelocl_emu.so" > ${D}/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd | ||
59 | } | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2022.1.0-3768.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2022.1.0-3768.bb deleted file mode 100644 index 8fe3b1d3..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2022.1.0-3768.bb +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files" | ||
2 | DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \ | ||
3 | that help your applications run faster on Intel® 64 architectures with support \ | ||
4 | for the latest C, C++, and SYCL language standards. This compiler produces \ | ||
5 | optimized code that can run significantly faster by taking advantage of the \ | ||
6 | ever-increasing core count and vector register width in Intel® Xeon® processors \ | ||
7 | and compatible processors." | ||
8 | |||
9 | HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html" | ||
10 | |||
11 | LICENSE="EULA" | ||
12 | |||
13 | LIC_FILES_CHKSUM = " \ | ||
14 | file://opt/intel/oneapi/licensing/2022.1.0/license.htm;md5=f721d37d5ef65590e052bc47e15feec3 \ | ||
15 | " | ||
16 | SRC_URI = " \ | ||
17 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \ | ||
18 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \ | ||
19 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \ | ||
20 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-2022.1.0-161_all.deb;subdir=${BPN};name=common-vars \ | ||
21 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=openmp-common \ | ||
22 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-2022.1.0-2022.1.0-161_all.deb;subdir=${BPN};name=license \ | ||
23 | " | ||
24 | |||
25 | SRC_URI[dpcpp-runtime.sha256sum] = "746d30e0794d0b60ab3d7cd31be9d7981b98c2b0305c238f1a9af5612a22b123" | ||
26 | SRC_URI[dpcpp-common.sha256sum] = "5bc6452a32f5781c96498515d061d8fe9d7bba13b41eb983fe9bb0f792621906" | ||
27 | SRC_URI[compiler-shared-runtime.sha256sum] = "c748adc3bac2f0f4c3419f0b1e5bdc34d1508832819deeef68336c290a2fd2be" | ||
28 | SRC_URI[common-vars.sha256sum] = "52a2726739652b4d3021a9f21d8ca664cd5582853b561e421f003b94789a4469" | ||
29 | SRC_URI[openmp-common.sha256sum] = "aaa06115d6cbad606373a61a512162f132c52360f6058970d7a4df55300fb826" | ||
30 | SRC_URI[license.sha256sum] = "30f36ef653964ac629ce77c2c2d21a923c7ba4ff88936c39a8f39237b7446cca" | ||
31 | |||
32 | S = "${WORKDIR}/${BPN}" | ||
33 | |||
34 | inherit bin_package | ||
35 | |||
36 | RDEPENDS:${PN} += "ocl-icd zlib tbb level-zero-loader bash" | ||
37 | |||
38 | INHIBIT_PACKAGE_STRIP = "1" | ||
39 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
40 | |||
41 | # doesn't have GNU_HASH (didn't pass LDFLAGS?) | ||
42 | INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths" | ||
43 | |||
44 | FILES_SOLIBSDEV = "" | ||
45 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb new file mode 100644 index 00000000..cedbae1e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb | |||
@@ -0,0 +1,54 @@ | |||
1 | SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files" | ||
2 | DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \ | ||
3 | that help your applications run faster on Intel® 64 architectures with support \ | ||
4 | for the latest C, C++, and SYCL language standards. This compiler produces \ | ||
5 | optimized code that can run significantly faster by taking advantage of the \ | ||
6 | ever-increasing core count and vector register width in Intel® Xeon® processors \ | ||
7 | and compatible processors." | ||
8 | |||
9 | HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html" | ||
10 | |||
11 | LICENSE="EULA" | ||
12 | |||
13 | COMPILERMAINVER = "2024.0" | ||
14 | |||
15 | LIC_FILES_CHKSUM = " \ | ||
16 | file://opt/intel/oneapi/licensing/${COMPILERMAINVER}/licensing/${COMPILERMAINVER}/license.htm;md5=5ff64c6ff3ef98089ed69360e7a84c39 \ | ||
17 | " | ||
18 | COMPILERDOTVER = "2024.0.0-49406" | ||
19 | DEVUTILITVERSION = "2024.0-2024.0.0-49320" | ||
20 | SRC_URI = " \ | ||
21 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \ | ||
22 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \ | ||
23 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \ | ||
24 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=common-vars \ | ||
25 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=openmp \ | ||
26 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=openmp-common \ | ||
27 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-${COMPILERMAINVER}-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=license \ | ||
28 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dev-utilities-${DEVUTILITVERSION}_amd64.deb;subdir=${BPN};name=dev-utils \ | ||
29 | " | ||
30 | |||
31 | SRC_URI[dpcpp-runtime.sha256sum] = "e24f0ba69daf3f66ceaf23d5e632f183cdb90bac69f65407fdb4407fc9034f33" | ||
32 | SRC_URI[dpcpp-common.sha256sum] = "f5a3db6a725598224edf1099260955aee3e36beadcaed2af5b8b453e873a82fa" | ||
33 | SRC_URI[compiler-shared-runtime.sha256sum] = "bce010cbe076259ddd3feb8e69792869e22fccd5b4e2c9af9e815826f2c1a394" | ||
34 | SRC_URI[common-vars.sha256sum] = "368553c99db1b52060b8225355336778be0b00e5991d0f769c42f891c6328750" | ||
35 | SRC_URI[openmp.sha256sum] = "154ff1e81adfdc872ba1d47bd860de70d62188417c7128422435dfd0ceca62fe" | ||
36 | SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c3843ba57d7894d15c07d" | ||
37 | SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6" | ||
38 | SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50" | ||
39 | |||
40 | S = "${WORKDIR}/${BPN}" | ||
41 | |||
42 | inherit bin_package | ||
43 | |||
44 | RDEPENDS:${PN} += "virtual-opencl-icd zlib tbb level-zero-loader bash tcsh" | ||
45 | SKIP_FILEDEPS:${PN} = '1' | ||
46 | |||
47 | INHIBIT_PACKAGE_STRIP = "1" | ||
48 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
49 | |||
50 | # doesn't have GNU_HASH (didn't pass LDFLAGS?) | ||
51 | INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps" | ||
52 | |||
53 | FILES_SOLIBSDEV = "" | ||
54 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2022.1.0-3768.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb index e396f1e7..90ada087 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2022.1.0-3768.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb | |||
@@ -10,19 +10,21 @@ HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-c | |||
10 | 10 | ||
11 | LICENSE="EULA" | 11 | LICENSE="EULA" |
12 | 12 | ||
13 | COMPILERMAINVER = "2024.0" | ||
14 | |||
13 | LIC_FILES_CHKSUM = " \ | 15 | LIC_FILES_CHKSUM = " \ |
14 | file://opt/intel/oneapi/compiler/2022.1.0/licensing/credist.txt;md5=f772f43824318f221f6363883e44201f \ | 16 | file://opt/intel/oneapi/compiler/${COMPILERMAINVER}/share/doc/compiler/credist.txt;md5=b41f55af9f479b9570fc35b955d5ba1a \ |
15 | " | 17 | " |
16 | 18 | ||
17 | SRC_URI = " \ | 19 | SRC_URI = " \ |
18 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \ | 20 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \ |
19 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \ | 21 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \ |
20 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=shared-common \ | 22 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=shared-common \ |
21 | " | 23 | " |
22 | 24 | ||
23 | SRC_URI[icx-compiler.sha256sum] = "c525c416c61cac9aa4e22fec78be95b88d33bca13360d0444c22da52eb8dd318" | 25 | SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77638f3f849796b62cd82" |
24 | SRC_URI[compiler-linker.sha256sum] = "3185dc02473b3d3a34234dd82a17c285e43701455636f93be235b52c2ac6f2c6" | 26 | SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236" |
25 | SRC_URI[shared-common.sha256sum] = "c9961b90a9c4f4636c78292b5ba3d6cf6bbd7081f1ce4a4690bb7db94596226e" | 27 | SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558" |
26 | 28 | ||
27 | S = "${WORKDIR}/${BPN}" | 29 | S = "${WORKDIR}/${BPN}" |
28 | 30 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.5.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb index 038bffce..fb341b01 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.5.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb | |||
@@ -6,15 +6,15 @@ HOMEPAGE = "https://github.com/embree/embree" | |||
6 | 6 | ||
7 | LICENSE = "Apache-2.0 & syrah" | 7 | LICENSE = "Apache-2.0 & syrah" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
9 | file://third-party-programs.txt;md5=86f6028ba2138fe41ac5c121d0a3518e \ | 9 | file://third-party-programs.txt;md5=f989f5b74cfff0d45d3ccf0e1366cbdc \ |
10 | file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8" | 10 | file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8" |
11 | 11 | ||
12 | inherit pkgconfig cmake | 12 | inherit pkgconfig cmake |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=devel3" | 16 | SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master" |
17 | SRCREV = "698442324ccddd11725fb8875275dc1384f7fb40" | 17 | SRCREV = "daa8de0e714e18ad5e5c9841b67c1950d9c91c51" |
18 | 18 | ||
19 | COMPATIBLE_HOST = '(x86_64).*-linux' | 19 | COMPATIBLE_HOST = '(x86_64).*-linux' |
20 | COMPATIBLE_HOST:libc-musl = "null" | 20 | COMPATIBLE_HOST:libc-musl = "null" |
@@ -22,9 +22,9 @@ COMPATIBLE_HOST:libc-musl = "null" | |||
22 | DEPENDS = "tbb jpeg libpng glfw ispc-native" | 22 | DEPENDS = "tbb jpeg libpng glfw ispc-native" |
23 | 23 | ||
24 | EXTRA_OECMAKE += " \ | 24 | EXTRA_OECMAKE += " \ |
25 | -DEMBREE_ISPC_SUPPORT=OFF \ | ||
26 | -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF \ | 25 | -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF \ |
27 | -DEMBREE_MAX_ISA=DEFAULT \ | 26 | -DEMBREE_MAX_ISA=DEFAULT \ |
28 | -DEMBREE_TUTORIALS=OFF \ | 27 | -DEMBREE_TUTORIALS=OFF \ |
29 | -DEMBREE_ISPC_SUPPORT=ON \ | 28 | -DEMBREE_ISPC_SUPPORT=ON \ |
29 | -DEMBREE_ZIP_MODE=OFF \ | ||
30 | " | 30 | " |
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb new file mode 100644 index 00000000..1841253e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \ | ||
2 | building blocks for cross-platform performance. Develop high-performance vision, \ | ||
3 | signal, security, and storage applications with this multithreaded software library." | ||
4 | HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html" | ||
5 | |||
6 | LICENSE = "ISSL" | ||
7 | |||
8 | MAXVER = "2021.10" | ||
9 | |||
10 | LIC_FILES_CHKSUM = " \ | ||
11 | file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/license.txt;md5=d7cdc92ed6c4de1263da879599ddc3e2 \ | ||
12 | file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/third-party-programs.txt;md5=22bd13987911dcf790907041b43081f3 \ | ||
13 | " | ||
14 | SRC_URI = " \ | ||
15 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-${MAXVER}-${PV}_amd64.deb;subdir=${BPN};name=ipp \ | ||
16 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-devel-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=headers \ | ||
17 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=env \ | ||
18 | " | ||
19 | |||
20 | SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd23e92bea07" | ||
21 | SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005" | ||
22 | SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6" | ||
23 | |||
24 | S = "${WORKDIR}/${BPN}" | ||
25 | |||
26 | COMPATIBLE_HOST:libc-musl = "null" | ||
27 | |||
28 | inherit bin_package | ||
29 | |||
30 | INHIBIT_PACKAGE_STRIP = "1" | ||
31 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
32 | INHIBIT_DEFAULT_DEPS = "" | ||
33 | |||
34 | RDEPENDS:${PN} += "tbb setup-intel-oneapi-env" | ||
35 | INSANE_SKIP:${PN} += "ldflags dev-so" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb deleted file mode 100644 index ae764253..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \ | ||
2 | building blocks for cross-platform performance. Develop high-performance vision, \ | ||
3 | signal, security, and storage applications with this multithreaded software library." | ||
4 | HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html" | ||
5 | |||
6 | LICENSE = "ISSL" | ||
7 | |||
8 | LIC_FILES_CHKSUM = " \ | ||
9 | file://opt/intel/oneapi/lib/licensing/ipp/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \ | ||
10 | file://opt/intel/oneapi/lib/licensing/ipp/third-party-programs.txt;md5=6cd9ad51f3b5cdfd4a355fa5599a6c03 \ | ||
11 | " | ||
12 | |||
13 | SRC_URI = " \ | ||
14 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-${PV}_amd64.deb;subdir=${BPN};name=runtime \ | ||
15 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-common-${PV}_all.deb;subdir=${BPN};name=common \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[runtime.sha256sum] = "98cd14bf635969d57bf9ea7bb27b90f27f72404f1927aa486a2bcf3c20a0f303" | ||
19 | SRC_URI[common.sha256sum] = "1aac41633179e824567b90afd39b8405db30df79a027421568df019b2b51bdd1" | ||
20 | |||
21 | S = "${WORKDIR}/${BPN}" | ||
22 | |||
23 | COMPATIBLE_HOST:libc-musl = "null" | ||
24 | |||
25 | inherit bin_package | ||
26 | |||
27 | INHIBIT_PACKAGE_STRIP = "1" | ||
28 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
29 | |||
30 | RDEPENDS:${PN} += "tbb setup-intel-oneapi-env" | ||
31 | INSANE_SKIP:${PN} += "ldflags dev-so" | ||
32 | |||
33 | # Some libraries are linking against the unversioned lib and there's no soname entry. | ||
34 | # Workaround errors like: | ||
35 | # Problem: conflicting requests | ||
36 | # - nothing provides libippcore_tl_omp.so()(64bit) needed by intel-oneapi-ipp-2021.3.0+333-r0.skylake_64 | ||
37 | do_install:append () { | ||
38 | install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so | ||
39 | install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so | ||
40 | install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so | ||
41 | install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so | ||
42 | } | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb deleted file mode 100644 index 2e9c17e3..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)" | ||
2 | DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \ | ||
3 | math library of highly optimized and extensively parallelized routines \ | ||
4 | for applications that require maximum performance. oneMKL contains \ | ||
5 | the high-performance optimizations from the full Intel® Math Kernel Library \ | ||
6 | for CPU architectures (with C/Fortran programming language interfaces)\ | ||
7 | and adds to them a set of DPC++ programming language interfaces for \ | ||
8 | achieving performance on various CPU architectures \ | ||
9 | and Intel Graphics Technology for certain key functionalities." | ||
10 | HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html" | ||
11 | |||
12 | LICENSE = "ISSL" | ||
13 | |||
14 | LIC_FILES_CHKSUM = " \ | ||
15 | file://opt/intel/oneapi/lib/licensing/mkl/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \ | ||
16 | file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \ | ||
17 | file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \ | ||
18 | file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \ | ||
19 | file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \ | ||
20 | file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs.txt;md5=980965cf1f086d40998ca4981968b6a4 \ | ||
21 | " | ||
22 | |||
23 | MKLMAINVER = "2022.0.1" | ||
24 | |||
25 | SRC_URI = " \ | ||
26 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-${PV}_amd64.deb;subdir=${BPN};name=runtime \ | ||
27 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-common-${PV}_all.deb;subdir=${BPN};name=common \ | ||
28 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=devel \ | ||
29 | " | ||
30 | |||
31 | SRC_URI[runtime.sha256sum] = "b20e0f7400fbbc55d8489f9f3ef35a8c8df7f5af7d87903bf305703e3a2ebc3b" | ||
32 | SRC_URI[common.sha256sum] = "bff8b2bfedbd09c9e6d0366cca3d4de80af521302bd5938fe6fa0128c6839041" | ||
33 | SRC_URI[devel.sha256sum] = "1c84c0b72638415318229326cb143691a5914d5e88552abef39391db3d285cff" | ||
34 | |||
35 | S = "${WORKDIR}/${BPN}" | ||
36 | |||
37 | inherit bin_package | ||
38 | |||
39 | do_install:append () { | ||
40 | install -d ${D}${libdir} | ||
41 | (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/lib/intel64/*.so* .) | ||
42 | install -d ${D}${libdir}/pkgconfig | ||
43 | (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .) | ||
44 | install -d ${D}${libdir}/cmake | ||
45 | (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .) | ||
46 | |||
47 | install -d ${D}${includedir} | ||
48 | (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/* .) | ||
49 | } | ||
50 | |||
51 | INHIBIT_PACKAGE_STRIP = "1" | ||
52 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
53 | |||
54 | RDEPENDS:${PN} += "bash tbb intel-oneapi-compiler setup-intel-oneapi-env" | ||
55 | INSANE_SKIP:${PN} = "ldflags textrel dev-so" | ||
56 | |||
57 | SYSROOT_DIRS += "/opt" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb new file mode 100644 index 00000000..e3e93028 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb | |||
@@ -0,0 +1,74 @@ | |||
1 | SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)" | ||
2 | DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \ | ||
3 | math library of highly optimized and extensively parallelized routines \ | ||
4 | for applications that require maximum performance. oneMKL contains \ | ||
5 | the high-performance optimizations from the full Intel® Math Kernel Library \ | ||
6 | for CPU architectures (with C/Fortran programming language interfaces)\ | ||
7 | and adds to them a set of DPC++ programming language interfaces for \ | ||
8 | achieving performance on various CPU architectures \ | ||
9 | and Intel Graphics Technology for certain key functionalities." | ||
10 | HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html" | ||
11 | |||
12 | LICENSE = "ISSL" | ||
13 | |||
14 | MKLMAINVER = "2024.0" | ||
15 | |||
16 | LIC_FILES_CHKSUM = " \ | ||
17 | file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/license.txt;md5=8510d21bf355a76e378c3216c3929ccd \ | ||
18 | file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \ | ||
19 | file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \ | ||
20 | file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \ | ||
21 | file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \ | ||
22 | file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs.txt;md5=27de873e4084d62530fe828406b33ca9 \ | ||
23 | " | ||
24 | |||
25 | SRC_URI = " \ | ||
26 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=runtime \ | ||
27 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-devel \ | ||
28 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-devel-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=devel \ | ||
29 | https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-vars \ | ||
30 | " | ||
31 | |||
32 | SRC_URI[runtime.sha256sum] = "10a86e24051d6ef4a80fd839c570e629190638a3c0ac9bcca99ab855f534b959" | ||
33 | SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c81655b268aa2c7bb908192" | ||
34 | SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84" | ||
35 | SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef" | ||
36 | |||
37 | S = "${WORKDIR}/${BPN}" | ||
38 | |||
39 | inherit bin_package | ||
40 | |||
41 | do_install:append () { | ||
42 | install -d ${D}${bindir} | ||
43 | (cd ${D}${bindir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/bin/* .) | ||
44 | install -d ${D}${libdir} | ||
45 | (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.so* .) | ||
46 | (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.a* .) | ||
47 | install -d ${D}${libdir}/pkgconfig | ||
48 | (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .) | ||
49 | install -d ${D}${libdir}/cmake | ||
50 | (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .) | ||
51 | |||
52 | install -d ${D}${includedir} | ||
53 | find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read srcdir; do | ||
54 | install -d ${D}${includedir}/$srcdir | ||
55 | (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcdir/* ./$srcdir/) | ||
56 | done | ||
57 | |||
58 | find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type f -printf '%f\n' | while read srcfile; do | ||
59 | (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcfile .) | ||
60 | done | ||
61 | } | ||
62 | |||
63 | AUTO_LIBNAME_PKGS = "" | ||
64 | INHIBIT_PACKAGE_STRIP = "1" | ||
65 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
66 | |||
67 | RDEPENDS:${PN} += "bash tbb intel-oneapi-dpcpp-cpp-runtime setup-intel-oneapi-env virtual-opencl-icd" | ||
68 | INSANE_SKIP:${PN} = "ldflags textrel dev-so staticdev arch already-stripped" | ||
69 | |||
70 | FILES:${PN}-staticdev += "/opt/intel/oneapi/mkl/${MKLMAINVER}/lib/*.a*" | ||
71 | |||
72 | SKIP_FILEDEPS:${PN} = '1' | ||
73 | |||
74 | SYSROOT_DIRS += "/opt" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch deleted file mode 100644 index 0f39a581..00000000 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 46b7de8c4ae0cc34805c2a11356c5a730fb8760a Mon Sep 17 00:00:00 2001 | ||
2 | From: Ezhilarasan <ezhilarasanx.s@intel.com> | ||
3 | Date: Fri, 4 Mar 2022 21:04:47 +0530 | ||
4 | Subject: [PATCH] remove-redundant-RPATH | ||
5 | |||
6 | Error Log: | ||
7 | ERROR: oidn-1.4.3-r0 do_package_qa: QA Issue: oidn: /usr/lib/libOpenImageDenoise.so.1.4.3 contains probably-redundant RPATH /usr/lib | ||
8 | oidn: /usr/bin/oidnTest contains probably-redundant RPATH /usr/lib | ||
9 | oidn: /usr/bin/oidnDenoise contains probably-redundant RPATH /usr/lib | ||
10 | oidn: /usr/bin/oidnBenchmark contains probably-redundant RPATH /usr/lib [useless-rpaths] | ||
11 | ERROR: oidn-1.4.3-r0 do_package_qa: Fatal QA errors were found, failing task. | ||
12 | |||
13 | Remove the redundant RPATH | ||
14 | |||
15 | Upstream-Status: Inappropriate | ||
16 | |||
17 | Signed-off-by: Ezhilarasan <ezhilarasanx.s@intel.com> | ||
18 | --- | ||
19 | cmake/oidn_package.cmake | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/cmake/oidn_package.cmake b/cmake/oidn_package.cmake | ||
23 | index 1f76af8..46c0854 100644 | ||
24 | --- a/cmake/oidn_package.cmake | ||
25 | +++ b/cmake/oidn_package.cmake | ||
26 | @@ -29,7 +29,7 @@ if(OIDN_ZIP_MODE) | ||
27 | set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") | ||
28 | endif() | ||
29 | else() | ||
30 | - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") | ||
31 | +# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") | ||
32 | endif() | ||
33 | |||
34 | ## ----------------------------------------------------------------------------- | ||
35 | -- | ||
36 | 2.17.1 | ||
37 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb index 8e055a57..4ea6ffbe 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb | |||
@@ -7,15 +7,14 @@ HOMEPAGE = "https://www.openimagedenoise.org/" | |||
7 | 7 | ||
8 | LICENSE = "Apache-2.0 & BSD-3-Clause" | 8 | LICENSE = "Apache-2.0 & BSD-3-Clause" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
10 | file://mkl-dnn/LICENSE;md5=8e17c0f9656ebaf0c380d9b22707c846 \ | 10 | file://external/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ |
11 | file://mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ | 11 | file://external/mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \ |
12 | file://mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ | 12 | file://external/mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \ |
13 | file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 13 | file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
14 | 14 | ||
15 | SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\ | 15 | SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\ |
16 | file://0001-remove-redundant-RPATH.patch \ | ||
17 | " | 16 | " |
18 | SRC_URI[sha256sum] = "3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a" | 17 | SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6" |
19 | 18 | ||
20 | inherit cmake | 19 | inherit cmake |
21 | 20 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.3.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb index 04255a3c..a2d709a1 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.3.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb | |||
@@ -20,16 +20,22 @@ S = "${WORKDIR}/git" | |||
20 | 20 | ||
21 | SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \ | 21 | SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \ |
22 | " | 22 | " |
23 | SRCREV = "ec551ea08cbceab187326e2358fdc1ceeffaf1d6" | 23 | SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce" |
24 | 24 | ||
25 | COMPATIBLE_HOST = '(x86_64).*-linux' | 25 | COMPATIBLE_HOST = '(x86_64).*-linux' |
26 | COMPATIBLE_HOST:libc-musl = "null" | 26 | COMPATIBLE_HOST:libc-musl = "null" |
27 | 27 | ||
28 | DEPENDS = "ispc-native rkcommon embree" | 28 | DEPENDS = "ispc ispc-native rkcommon embree" |
29 | 29 | ||
30 | EXTRA_OECMAKE += " \ | 30 | EXTRA_OECMAKE += " \ |
31 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ | 31 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ |
32 | " | 32 | " |
33 | EXTRA_OECMAKE:intel-corei7-64 += " \ | ||
34 | -DOPENVKL_ISA_AVX=OFF \ | ||
35 | -DOPENVKL_ISA_AVX2=OFF \ | ||
36 | -DOPENVKL_ISA_AVX512SKX=OFF \ | ||
37 | " | ||
38 | |||
33 | PACKAGES =+ "${PN}-examples" | 39 | PACKAGES =+ "${PN}-examples" |
34 | FILES:${PN}-examples = "\ | 40 | FILES:${PN}-examples = "\ |
35 | ${bindir} \ | 41 | ${bindir} \ |
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.10.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb index bd0d41d8..3e03dcc2 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.10.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://www.ospray.org/" | |||
6 | 6 | ||
7 | LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" | 7 | LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \ |
9 | file://third-party-programs.txt;md5=7cccb4c920e5b7de8eddf8a5d408d900 \ | 9 | file://third-party-programs.txt;md5=e37b77e3bd997abccc359c710fb1f1db \ |
10 | " | 10 | " |
11 | 11 | ||
12 | inherit pkgconfig cmake | 12 | inherit pkgconfig cmake |
@@ -15,17 +15,18 @@ S = "${WORKDIR}/git" | |||
15 | 15 | ||
16 | SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \ | 16 | SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \ |
17 | " | 17 | " |
18 | SRCREV = "fdda0889f9143a8b20f26389c22d1691f1a6a527" | 18 | SRCREV = "f2a61c2eb58ccd666e34abfdb0fd7049ea073194" |
19 | 19 | ||
20 | COMPATIBLE_HOST = '(x86_64).*-linux' | 20 | COMPATIBLE_HOST = '(x86_64).*-linux' |
21 | COMPATIBLE_HOST:libc-musl = "null" | 21 | COMPATIBLE_HOST:libc-musl = "null" |
22 | 22 | ||
23 | DEPENDS = "rkcommon ispc-native openvkl embree" | 23 | DEPENDS = "rkcommon ispc ispc-native openvkl embree" |
24 | 24 | ||
25 | EXTRA_OECMAKE += " \ | 25 | EXTRA_OECMAKE += " \ |
26 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ | 26 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ |
27 | -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF \ | 27 | -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF \ |
28 | -DOSPRAY_ENABLE_APPS_TESTING=OFF \ | 28 | -DOSPRAY_ENABLE_APPS_TESTING=OFF \ |
29 | -DOSPRAY_ENABLE_APPS_EXAMPLES=OFF \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | PACKAGES =+ "${PN}-apps" | 32 | PACKAGES =+ "${PN}-apps" |
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.10.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb index 8bf6d28b..fe6b23ea 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.10.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb | |||
@@ -12,7 +12,7 @@ S = "${WORKDIR}/git" | |||
12 | 12 | ||
13 | SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \ | 13 | SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \ |
14 | " | 14 | " |
15 | SRCREV = "0b8856cd9278474b56dc5bcff516a4b9482cf147" | 15 | SRCREV = "7ebfa0765ea590767202b328e7da38102c2f5a15" |
16 | 16 | ||
17 | DEPENDS = "tbb" | 17 | DEPENDS = "tbb" |
18 | 18 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch index 7fede93c..11305e83 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch | |||
@@ -1,48 +1,50 @@ | |||
1 | 1 | Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut | |
2 | builds | ||
2 | Upstream-Status: Backport | 3 | Upstream-Status: Backport |
3 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 4 | Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com> |
4 | 5 | --- | |
5 | MdePkg/Include/Base.h | 12 ++++++++++++ | 6 | MdePkg/Include/Base.h | 12 ++++++++++++ |
6 | 1 file changed, 12 insertions(+) | 7 | 1 file changed, 12 insertions(+) |
7 | 8 | ||
8 | diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h | 9 | diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h |
9 | index 2da08b0c78..072eefdb94 100644 | 10 | index d209e6de28..6e61b8f3d3 100644 |
10 | --- a/MdePkg/Include/Base.h | 11 | --- a/MdePkg/Include/Base.h |
11 | +++ b/MdePkg/Include/Base.h | 12 | +++ b/MdePkg/Include/Base.h |
12 | @@ -318,7 +318,11 @@ struct _LIST_ENTRY { | 13 | @@ -316,8 +316,12 @@ struct _LIST_ENTRY { |
13 | /// | 14 | #define NULL __null |
14 | /// NULL pointer (VOID *) | 15 | #endif |
15 | /// | 16 | #else |
16 | +#ifndef OS_BUILD | 17 | +#ifndef OS_BUILD |
17 | +#ifndef UNIT_TEST_UEFI_BUILD | 18 | +#ifndef UNIT_TEST_UEFI_BUILD |
18 | #define NULL ((VOID *) 0) | 19 | #define NULL ((VOID *) 0) |
20 | #endif | ||
19 | +#endif | 21 | +#endif |
20 | +#endif | 22 | +#endif |
21 | 23 | ||
22 | // | 24 | // |
23 | // Null character | 25 | // Null character |
24 | @@ -810,6 +814,8 @@ typedef UINTN *BASE_LIST; | 26 | @@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST; |
25 | // Section 2.3.1 of the UEFI 2.3 Specification. | 27 | // Section 2.3.1 of the UEFI 2.3 Specification. |
26 | // | 28 | // |
27 | 29 | ||
28 | +#ifndef OS_BUILD | 30 | +#ifndef OS_BUILD |
29 | +#ifndef UNIT_TEST_UEFI_BUILD | 31 | +#ifndef UNIT_TEST_UEFI_BUILD |
30 | STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); | 32 | STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); |
31 | STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); | 33 | STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); |
32 | STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); | 34 | STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); |
33 | @@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi | 35 | @@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi |
34 | STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); | 36 | STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); |
35 | STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); | 37 | STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); |
36 | STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); | 38 | STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); |
37 | +#endif | 39 | +#endif |
38 | +#endif | 40 | +#endif |
39 | 41 | ||
40 | // | 42 | // |
41 | // The following three enum types are used to verify that the compiler | 43 | // The following three enum types are used to verify that the compiler |
42 | @@ -843,9 +851,13 @@ typedef enum { | 44 | @@ -812,9 +820,13 @@ typedef enum { |
43 | __VerifyUint32EnumValue = 0xffffffff | 45 | __VerifyUint32EnumValue = 0xffffffff |
44 | } __VERIFY_UINT32_ENUM_SIZE; | 46 | } __VERIFY_UINT32_ENUM_SIZE; |
45 | 47 | ||
46 | +#ifndef OS_BUILD | 48 | +#ifndef OS_BUILD |
47 | +#ifndef UNIT_TEST_UEFI_BUILD | 49 | +#ifndef UNIT_TEST_UEFI_BUILD |
48 | STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 50 | STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
@@ -50,8 +52,8 @@ index 2da08b0c78..072eefdb94 100644 | |||
50 | STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 52 | STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
51 | +#endif | 53 | +#endif |
52 | +#endif | 54 | +#endif |
53 | 55 | ||
54 | /** | 56 | /** |
55 | Macro that returns a pointer to the data structure that contains a specified field of | 57 | Macro that returns a pointer to the data structure that contains a specified field of |
56 | -- | 58 | -- |
57 | 2.31.0.windows.1 | 59 | 2.37.3 |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0468.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb index f38a64c3..c4743d1c 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0468.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb | |||
@@ -15,15 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause" | |||
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ | 15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ |
16 | file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" | 16 | file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" |
17 | 17 | ||
18 | SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ | 18 | SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \ |
19 | git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \ | 19 | git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \ |
20 | file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ | 20 | file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ |
21 | file://0001-CMakeLists-disable-Werror.patch \ | 21 | file://0001-CMakeLists-disable-Werror.patch \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRCREV_ipmctl = "cd3bd60f84cb7167fa81257bd33db90fa1f5a70b" | 24 | SRCREV_ipmctl = "c75bd840ea7820c8f93a5488fcff75d08beedd51" |
25 | #tag edk2-stable202208 | 25 | #tag edk2-stable202302 |
26 | SRCREV_edk2 = "ba0e0e4c6a174b71b18ccd6e47319cc45878893c" | 26 | SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3" |
27 | SRCREV_FORMAT = "ipmctl_edk2" | ||
27 | 28 | ||
28 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
29 | 30 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch new file mode 100644 index 00000000..d1851406 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com> | ||
3 | Date: Tue, 20 Feb 2024 02:28:14 +0200 | ||
4 | Subject: [PATCH] [CPU] Solving the build failure caused by setting the | ||
5 | "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934) | ||
6 | |||
7 | ### Details: | ||
8 | See the [ticket | ||
9 | description](https://jira.devtools.intel.com/browse/CVS-132119). The | ||
10 | solution was checked only on a local setup on Ubuntu, if there's a way | ||
11 | to check that using the CI please let me know (or if you could run the | ||
12 | job and paste the link in the comments I would be grateful). | ||
13 | |||
14 | Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if | ||
15 | this is the ideal fix and no side effects are introduced. Please take | ||
16 | that into account when reviewing/merging. | ||
17 | |||
18 | ### Tickets: | ||
19 | - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119) | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8] | ||
22 | |||
23 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
24 | --- | ||
25 | src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +- | ||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt | ||
29 | index db5ae8d01c..6941cb528d 100644 | ||
30 | --- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt | ||
31 | +++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt | ||
32 | @@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp | ||
33 | if(ENABLE_OV_ONNX_FRONTEND) | ||
34 | list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}") | ||
35 | else() | ||
36 | - set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx) | ||
37 | + set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx) | ||
38 | endif() | ||
39 | |||
40 | if(NOT (ARM OR AARCH64)) | ||
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch deleted file mode 100644 index 2dde9880..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch +++ /dev/null | |||
@@ -1,196 +0,0 @@ | |||
1 | From 86fc5a725883cf59086c319fca29ddb3e47fa7de Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 7 Apr 2022 21:39:26 +0800 | ||
4 | Subject: [PATCH 1/2] Use system installed dependencies | ||
5 | |||
6 | Use the system versions of libva, ade and zlib. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | --- | ||
11 | cmake/dependencies.cmake | 20 -------------------- | ||
12 | cmake/extra_modules.cmake | 4 ++-- | ||
13 | src/plugins/intel_gpu/include/va/va.h | 6 ------ | ||
14 | tests/fuzz/src/CMakeLists.txt | 3 +-- | ||
15 | thirdparty/CMakeLists.txt | 25 +++++++++++-------------- | ||
16 | thirdparty/cnpy/CMakeLists.txt | 2 +- | ||
17 | 6 files changed, 15 insertions(+), 45 deletions(-) | ||
18 | delete mode 100644 src/plugins/intel_gpu/include/va/va.h | ||
19 | |||
20 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | ||
21 | index 8d66a012b8..75db89b915 100644 | ||
22 | --- a/cmake/dependencies.cmake | ||
23 | +++ b/cmake/dependencies.cmake | ||
24 | @@ -27,26 +27,6 @@ get_linux_name(LINUX_OS_NAME) | ||
25 | |||
26 | if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") | ||
27 | set(protoc_version "3.18.2") | ||
28 | - | ||
29 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | ||
30 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | ||
31 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" | ||
32 | - SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21" | ||
33 | - ) | ||
34 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | ||
35 | - | ||
36 | - reset_deps_cache(SYSTEM_PROTOC) | ||
37 | - | ||
38 | - find_host_program( | ||
39 | - SYSTEM_PROTOC | ||
40 | - NAMES protoc | ||
41 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" | ||
42 | - NO_DEFAULT_PATH) | ||
43 | - if(NOT SYSTEM_PROTOC) | ||
44 | - message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") | ||
45 | - endif() | ||
46 | - | ||
47 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | ||
48 | endif() | ||
49 | |||
50 | if(ENABLE_INTEL_MYRIAD) | ||
51 | diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake | ||
52 | index 72eed6ad3a..39e9674a11 100644 | ||
53 | --- a/cmake/extra_modules.cmake | ||
54 | +++ b/cmake/extra_modules.cmake | ||
55 | @@ -22,7 +22,7 @@ function(ie_generate_dev_package_config) | ||
56 | configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" | ||
57 | "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" | ||
58 | INSTALL_DESTINATION share # not used | ||
59 | - PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" | ||
60 | + PATH_VARS "OpenVINO_SOURCE_DIR" | ||
61 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
62 | |||
63 | configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" | ||
64 | @@ -53,7 +53,7 @@ function(ov_generate_dev_package_config) | ||
65 | configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in" | ||
66 | "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake" | ||
67 | INSTALL_DESTINATION share # not used | ||
68 | - PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" | ||
69 | + PATH_VARS "OpenVINO_SOURCE_DIR" | ||
70 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
71 | |||
72 | configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in" | ||
73 | diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h | ||
74 | deleted file mode 100644 | ||
75 | index 5c8a5c6f6e..0000000000 | ||
76 | --- a/src/plugins/intel_gpu/include/va/va.h | ||
77 | +++ /dev/null | ||
78 | @@ -1,6 +0,0 @@ | ||
79 | -// Copyright (C) 2018-2022 Intel Corporation | ||
80 | -// SPDX-License-Identifier: Apache-2.0 | ||
81 | -// | ||
82 | - | ||
83 | -typedef cl_uint VASurfaceID; | ||
84 | -typedef void* VADisplay; | ||
85 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt | ||
86 | index 5e6b7b168e..a81c51bb77 100644 | ||
87 | --- a/tests/fuzz/src/CMakeLists.txt | ||
88 | +++ b/tests/fuzz/src/CMakeLists.txt | ||
89 | @@ -10,14 +10,13 @@ add_custom_target(fuzz) | ||
90 | FILE(GLOB tests "*-fuzzer.cc") | ||
91 | |||
92 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) | ||
93 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) | ||
94 | |||
95 | foreach(test_source ${tests}) | ||
96 | get_filename_component(test_name ${test_source} NAME_WE) | ||
97 | add_fuzzer(${test_name} ${test_source}) | ||
98 | |||
99 | target_link_libraries(${test_name} PRIVATE | ||
100 | - openvino::runtime cnpy zlib) | ||
101 | + openvino::runtime cnpy z) | ||
102 | |||
103 | add_dependencies(fuzz ${test_name}) | ||
104 | |||
105 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
106 | index 38b0a5439d..4cba1588fe 100644 | ||
107 | --- a/thirdparty/CMakeLists.txt | ||
108 | +++ b/thirdparty/CMakeLists.txt | ||
109 | @@ -14,7 +14,7 @@ add_subdirectory(ittapi) | ||
110 | add_subdirectory(itt_collector EXCLUDE_FROM_ALL) | ||
111 | add_subdirectory(cnpy EXCLUDE_FROM_ALL) | ||
112 | if(ENABLE_INTEL_GPU) | ||
113 | - add_subdirectory(ocl) | ||
114 | + #add_subdirectory(ocl) | ||
115 | endif() | ||
116 | |||
117 | add_subdirectory(xbyak EXCLUDE_FROM_ALL) | ||
118 | @@ -72,12 +72,11 @@ endif() | ||
119 | add_library(ocv_hal INTERFACE) | ||
120 | target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv") | ||
121 | |||
122 | -add_subdirectory(ade EXCLUDE_FROM_ALL) | ||
123 | add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL) | ||
124 | -set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) | ||
125 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) | ||
126 | +set_target_properties(fluid PROPERTIES FOLDER thirdparty) | ||
127 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) | ||
128 | + | ||
129 | |||
130 | -ov_install_static_lib(ade openvino_common) | ||
131 | ov_install_static_lib(fluid openvino_common) | ||
132 | |||
133 | # | ||
134 | @@ -93,8 +92,6 @@ if(gflags_FOUND) | ||
135 | set_target_properties(gflags PROPERTIES IMPORTED_GLOBAL ON) | ||
136 | message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}") | ||
137 | else() | ||
138 | - add_subdirectory(gflags EXCLUDE_FROM_ALL) | ||
139 | - openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags) | ||
140 | endif() | ||
141 | |||
142 | # | ||
143 | @@ -119,13 +116,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
144 | set(Protobuf_DEBUG ON) | ||
145 | endif() | ||
146 | find_package(Protobuf 3.18.2 REQUIRED) | ||
147 | - set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) | ||
148 | - set(Protobuf_LIBRARIES protobuf::libprotobuf) | ||
149 | - set(SYSTEM_PROTOC protobuf::protoc) | ||
150 | + set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) | ||
151 | + set(Protobuf_LIBRARIES protobuf::libprotobuf) | ||
152 | + #set(SYSTEM_PROTOC protobuf::protoc) | ||
153 | set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC}) | ||
154 | |||
155 | foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES}) | ||
156 | - set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) | ||
157 | + #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) | ||
158 | endforeach() | ||
159 | else() | ||
160 | add_subdirectory(protobuf EXCLUDE_FROM_ALL) | ||
161 | @@ -134,8 +131,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
162 | # forward variables used in the other places | ||
163 | set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE) | ||
164 | set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE) | ||
165 | - set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE) | ||
166 | - set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE) | ||
167 | + set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE) | ||
168 | + set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE) | ||
169 | set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE) | ||
170 | set(Protobuf_IN_FRONTEND ON PARENT_SCOPE) | ||
171 | |||
172 | @@ -146,7 +143,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
173 | set(link_type INTERFACE) | ||
174 | endif() | ||
175 | if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) | ||
176 | - target_compile_options(${target} ${link_type} -Wno-undef) | ||
177 | + #target_compile_options(${target} ${link_type} -Wno-undef) | ||
178 | endif() | ||
179 | endforeach() | ||
180 | endif() | ||
181 | diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt | ||
182 | index 556adb03c4..793de9845c 100644 | ||
183 | --- a/thirdparty/cnpy/CMakeLists.txt | ||
184 | +++ b/thirdparty/cnpy/CMakeLists.txt | ||
185 | @@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") | ||
186 | PRIVATE -Wno-all) | ||
187 | endif() | ||
188 | |||
189 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib::zlib) | ||
190 | +target_link_libraries(${TARGET_NAME} PUBLIC z) | ||
191 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") | ||
192 | |||
193 | set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty) | ||
194 | -- | ||
195 | 2.37.3 | ||
196 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch new file mode 100644 index 00000000..d251f21b --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Fri, 15 Mar 2024 16:28:41 +0800 | ||
4 | Subject: [PATCH] cmake: fix build when using sysroot | ||
5 | |||
6 | When cross-compiling against a sysroot, system headers will not be at a place | ||
7 | that starts with /usr. Update conditional check to exclude directories | ||
8 | which have "/usr/include" in them to not add <sysroot>/usr/include as well. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486] | ||
11 | |||
12 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
13 | --- | ||
14 | src/cmake/ov_parallel.cmake | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake | ||
18 | index 3793db98e30..819d3410531 100644 | ||
19 | --- a/src/cmake/ov_parallel.cmake | ||
20 | +++ b/src/cmake/ov_parallel.cmake | ||
21 | @@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME) | ||
22 | if(include_directories) | ||
23 | foreach(include_directory IN LISTS include_directories) | ||
24 | # cannot include /usr/include headers as SYSTEM | ||
25 | - if(NOT "${include_directory}" MATCHES "^/usr.*$") | ||
26 | + if(NOT "${include_directory}" MATCHES ".*/usr/include.*$") | ||
27 | target_include_directories(${TARGET_NAME} SYSTEM | ||
28 | ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>) | ||
29 | else() | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch new file mode 100644 index 00000000..7ab31309 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | |||
@@ -0,0 +1,90 @@ | |||
1 | From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:42:57 +0530 | ||
4 | Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process | ||
5 | |||
6 | * Dont try to detect glibc version as that doesn't work when cross compiling. | ||
7 | * Install sample binaries as well. | ||
8 | * Dont strip binaries. | ||
9 | * Dont try to write triggers for CPack. We package ourselves. | ||
10 | * Fix the installation path for Python modules when baselib = lib64. | ||
11 | |||
12 | Upstream-Status: Inappropriate | ||
13 | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- | ||
17 | cmake/developer_package/target_flags.cmake | 2 +- | ||
18 | samples/cpp/CMakeLists.txt | 6 +++--- | ||
19 | src/bindings/python/CMakeLists.txt | 2 +- | ||
20 | src/bindings/python/wheel/setup.py | 1 - | ||
21 | 5 files changed, 6 insertions(+), 7 deletions(-) | ||
22 | |||
23 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
24 | index a7c0ec2cf61..40448e8a962 100644 | ||
25 | --- a/cmake/developer_package/packaging/rpm/rpm.cmake | ||
26 | +++ b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
27 | @@ -154,7 +154,7 @@ ov_rpm_specific_settings() | ||
28 | # needed to add triggers for packages with libraries | ||
29 | set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") | ||
30 | set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") | ||
31 | -file(WRITE "${def_triggers}" "${triggers_content}") | ||
32 | +#file(WRITE "${def_triggers}" "${triggers_content}") | ||
33 | |||
34 | # | ||
35 | # Functions helpful for packaging your modules with RPM cpack | ||
36 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake | ||
37 | index 29f23e713e1..942dd445b19 100644 | ||
38 | --- a/cmake/developer_package/target_flags.cmake | ||
39 | +++ b/cmake/developer_package/target_flags.cmake | ||
40 | @@ -145,4 +145,4 @@ function(ov_glibc_version) | ||
41 | endif() | ||
42 | endfunction() | ||
43 | |||
44 | -ov_glibc_version() | ||
45 | +#ov_glibc_version() | ||
46 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
47 | index c814cc37e2c..431e7bd2ed3 100644 | ||
48 | --- a/samples/cpp/CMakeLists.txt | ||
49 | +++ b/samples/cpp/CMakeLists.txt | ||
50 | @@ -206,9 +206,9 @@ macro(ov_add_sample) | ||
51 | target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) | ||
52 | |||
53 | install(TARGETS ${SAMPLE_NAME} | ||
54 | - RUNTIME DESTINATION samples_bin/ | ||
55 | - COMPONENT samples_bin | ||
56 | - EXCLUDE_FROM_ALL) | ||
57 | + DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
58 | + COMPONENT samples_bin) | ||
59 | + | ||
60 | |||
61 | # create global target with all samples / demo apps | ||
62 | if(NOT TARGET ov_samples) | ||
63 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt | ||
64 | index 58ff9b74302..4763994ba56 100644 | ||
65 | --- a/src/bindings/python/CMakeLists.txt | ||
66 | +++ b/src/bindings/python/CMakeLists.txt | ||
67 | @@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING) | ||
68 | endif() | ||
69 | |||
70 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") | ||
71 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") | ||
72 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") | ||
73 | set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") | ||
74 | set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO") | ||
75 | |||
76 | diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py | ||
77 | index 4b056912212..5f05d891310 100644 | ||
78 | --- a/src/bindings/python/wheel/setup.py | ||
79 | +++ b/src/bindings/python/wheel/setup.py | ||
80 | @@ -270,7 +270,6 @@ class CustomBuild(build): | ||
81 | self.spawn(["cmake", "--install", binary_dir, | ||
82 | "--prefix", prefix, | ||
83 | "--config", CONFIG, | ||
84 | - "--strip", | ||
85 | "--component", cpack_comp_name]) | ||
86 | |||
87 | def run(self): | ||
88 | -- | ||
89 | 2.34.1 | ||
90 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch deleted file mode 100644 index 12c8054e..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch +++ /dev/null | |||
@@ -1,348 +0,0 @@ | |||
1 | From 3d55027cd86db299faeed0a4a97ddcec1baedd61 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Mon, 11 Apr 2022 11:11:23 +0800 | ||
4 | Subject: [PATCH 2/2] Fix installation of binaries and libraries | ||
5 | |||
6 | Make sure binaries are installed correctly. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 2 +- | ||
13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
14 | cmake/developer_package/packaging.cmake | 4 ++-- | ||
15 | cmake/developer_package/plugins/plugins.cmake | 2 +- | ||
16 | docs/CMakeLists.txt | 3 ++- | ||
17 | samples/CMakeLists.txt | 2 +- | ||
18 | samples/c/common/opencv_c_wrapper/CMakeLists.txt | 2 ++ | ||
19 | samples/cpp/CMakeLists.txt | 2 ++ | ||
20 | scripts/CMakeLists.txt | 10 +++++----- | ||
21 | src/bindings/c/src/CMakeLists.txt | 4 ++-- | ||
22 | src/cmake/openvino.cmake | 12 ++++++------ | ||
23 | src/common/preprocessing/CMakeLists.txt | 2 +- | ||
24 | src/core/CMakeLists.txt | 4 ++-- | ||
25 | src/inference/CMakeLists.txt | 2 +- | ||
26 | .../intel_gpu/src/kernel_selector/CMakeLists.txt | 2 +- | ||
27 | src/plugins/intel_myriad/myriad_dependencies.cmake | 2 +- | ||
28 | .../intel_myriad/myriad_plugin/CMakeLists.txt | 2 +- | ||
29 | tools/CMakeLists.txt | 2 +- | ||
30 | tools/compile_tool/CMakeLists.txt | 8 ++++---- | ||
31 | 19 files changed, 37 insertions(+), 32 deletions(-) | ||
32 | |||
33 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
34 | index f570d4246c..d20ac60749 100644 | ||
35 | --- a/CMakeLists.txt | ||
36 | +++ b/CMakeLists.txt | ||
37 | @@ -111,7 +111,7 @@ include(cmake/extra_modules.cmake) | ||
38 | add_subdirectory(docs) | ||
39 | add_subdirectory(tools) | ||
40 | add_subdirectory(scripts) | ||
41 | -add_subdirectory(licensing) | ||
42 | +#add_subdirectory(licensing) | ||
43 | |||
44 | # | ||
45 | # CPack | ||
46 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
47 | index 0779ed286d..f80cb9bb79 100644 | ||
48 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
49 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
50 | @@ -2,7 +2,7 @@ | ||
51 | # SPDX-License-Identifier: Apache-2.0 | ||
52 | # | ||
53 | |||
54 | -set(FRONTEND_INSTALL_INCLUDE "runtime/include/") | ||
55 | +set(FRONTEND_INSTALL_INCLUDE "include/") | ||
56 | set(FRONTEND_NAME_PREFIX "openvino_") | ||
57 | set(FRONTEND_NAME_SUFFIX "_frontend") | ||
58 | |||
59 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | ||
60 | index 458ddade93..626eb6548a 100644 | ||
61 | --- a/cmake/developer_package/packaging.cmake | ||
62 | +++ b/cmake/developer_package/packaging.cmake | ||
63 | @@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir) | ||
64 | set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) | ||
65 | set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) | ||
66 | else() | ||
67 | - set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
68 | - set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
69 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
70 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
71 | set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
72 | endif() | ||
73 | endfunction() | ||
74 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake | ||
75 | index b748ebddef..fe670e88bc 100644 | ||
76 | --- a/cmake/developer_package/plugins/plugins.cmake | ||
77 | +++ b/cmake/developer_package/plugins/plugins.cmake | ||
78 | @@ -139,7 +139,7 @@ function(ie_add_plugin) | ||
79 | |||
80 | if(BUILD_SHARED_LIBS) | ||
81 | install(TARGETS ${IE_PLUGIN_NAME} | ||
82 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
83 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
84 | COMPONENT ${install_component}) | ||
85 | else() | ||
86 | ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component}) | ||
87 | diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt | ||
88 | index 86b0e8652b..4f31d3cc4b 100644 | ||
89 | --- a/docs/CMakeLists.txt | ||
90 | +++ b/docs/CMakeLists.txt | ||
91 | @@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER) | ||
92 | foreach(target openvino_template_plugin template_extension openvino_template_extension) | ||
93 | if(TARGET ${target}) | ||
94 | install(TARGETS ${target} | ||
95 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
96 | + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
97 | COMPONENT tests | ||
98 | EXCLUDE_FROM_ALL) | ||
99 | + install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
100 | endif() | ||
101 | endforeach() | ||
102 | endif() | ||
103 | diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt | ||
104 | index 8101b5e328..6abe8c20ce 100644 | ||
105 | --- a/samples/CMakeLists.txt | ||
106 | +++ b/samples/CMakeLists.txt | ||
107 | @@ -9,7 +9,7 @@ add_subdirectory(c) | ||
108 | if(TARGET format_reader) | ||
109 | install(TARGETS format_reader | ||
110 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL | ||
111 | - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL) | ||
112 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests) | ||
113 | endif() | ||
114 | |||
115 | openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) | ||
116 | diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
117 | index 2755579a0f..4a5f5b424f 100644 | ||
118 | --- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
119 | +++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
120 | @@ -34,3 +34,5 @@ install( | ||
121 | RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL | ||
122 | LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL | ||
123 | ) | ||
124 | + | ||
125 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
126 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
127 | index 3628c8283a..186540940f 100644 | ||
128 | --- a/samples/cpp/CMakeLists.txt | ||
129 | +++ b/samples/cpp/CMakeLists.txt | ||
130 | @@ -258,6 +258,8 @@ macro(ie_add_sample) | ||
131 | COMPONENT samples_bin | ||
132 | EXCLUDE_FROM_ALL) | ||
133 | |||
134 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
135 | + | ||
136 | # create global target with all samples / demo apps | ||
137 | if(NOT TARGET ie_samples) | ||
138 | add_custom_target(ie_samples ALL) | ||
139 | diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt | ||
140 | index 4e9f76638f..6d8df5f0a1 100644 | ||
141 | --- a/scripts/CMakeLists.txt | ||
142 | +++ b/scripts/CMakeLists.txt | ||
143 | @@ -37,7 +37,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" | ||
144 | |||
145 | # install setupvars | ||
146 | |||
147 | -ie_cpack_add_component(setupvars REQUIRED) | ||
148 | +#ie_cpack_add_component(setupvars REQUIRED) | ||
149 | |||
150 | if(UNIX) | ||
151 | set(_setupvars_file setupvars/setupvars.sh) | ||
152 | @@ -54,13 +54,13 @@ elseif(WIN32) | ||
153 | file(WRITE "${_setupvars_file}" "${_setupvars_content}") | ||
154 | endif() | ||
155 | endif() | ||
156 | -install(PROGRAMS "${_setupvars_file}" | ||
157 | - DESTINATION . | ||
158 | - COMPONENT setupvars) | ||
159 | +#install(PROGRAMS "${_setupvars_file}" | ||
160 | +# DESTINATION . | ||
161 | +# COMPONENT setupvars) | ||
162 | |||
163 | # install install_dependencies | ||
164 | |||
165 | -if(LINUX) | ||
166 | +if (FALSE) | ||
167 | ie_cpack_add_component(install_dependencies REQUIRED) | ||
168 | install(DIRECTORY install_dependencies/ | ||
169 | DESTINATION install_dependencies | ||
170 | diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt | ||
171 | index 9200d0bda1..b3636e0716 100644 | ||
172 | --- a/src/bindings/c/src/CMakeLists.txt | ||
173 | +++ b/src/bindings/c/src/CMakeLists.txt | ||
174 | @@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets | ||
175 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c | ||
176 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c | ||
177 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c | ||
178 | - INCLUDES DESTINATION runtime/include/ie) | ||
179 | + INCLUDES DESTINATION include/ie) | ||
180 | |||
181 | install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ | ||
182 | - DESTINATION runtime/include/ie | ||
183 | + DESTINATION include/ie | ||
184 | COMPONENT core_c_dev) | ||
185 | diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake | ||
186 | index 340896e3a8..9bda84fe51 100644 | ||
187 | --- a/src/cmake/openvino.cmake | ||
188 | +++ b/src/cmake/openvino.cmake | ||
189 | @@ -62,8 +62,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets | ||
190 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
191 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core | ||
192 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core | ||
193 | - INCLUDES DESTINATION runtime/include | ||
194 | - runtime/include/ie) | ||
195 | + INCLUDES DESTINATION include | ||
196 | + include/ie) | ||
197 | |||
198 | # | ||
199 | # Add openvin::dev target | ||
200 | @@ -107,7 +107,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components}) | ||
201 | |||
202 | if(BUILD_SHARED_LIBS) | ||
203 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
204 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
205 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
206 | COMPONENT core) | ||
207 | |||
208 | # for InferenceEngineUnitTest | ||
209 | @@ -126,7 +126,7 @@ endif() | ||
210 | install(EXPORT OpenVINOTargets | ||
211 | FILE OpenVINOTargets.cmake | ||
212 | NAMESPACE openvino:: | ||
213 | - DESTINATION runtime/cmake | ||
214 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO | ||
215 | COMPONENT core_dev) | ||
216 | |||
217 | set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include") | ||
218 | @@ -167,10 +167,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm | ||
219 | |||
220 | install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
221 | "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" | ||
222 | - DESTINATION runtime/cmake | ||
223 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
224 | COMPONENT core_dev) | ||
225 | |||
226 | install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" | ||
227 | "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" | ||
228 | - DESTINATION runtime/cmake | ||
229 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO | ||
230 | COMPONENT core_dev) | ||
231 | diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt | ||
232 | index e41e286c95..11aaffca6a 100644 | ||
233 | --- a/src/common/preprocessing/CMakeLists.txt | ||
234 | +++ b/src/common/preprocessing/CMakeLists.txt | ||
235 | @@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) | ||
236 | |||
237 | if(BUILD_SHARED_LIBS) | ||
238 | install(TARGETS ${TARGET_NAME} | ||
239 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
240 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
241 | else() | ||
242 | ov_install_static_lib(${TARGET_NAME} core) | ||
243 | endif() | ||
244 | diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt | ||
245 | index 86b195ee1c..867121ee50 100644 | ||
246 | --- a/src/core/CMakeLists.txt | ||
247 | +++ b/src/core/CMakeLists.txt | ||
248 | @@ -127,7 +127,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_ | ||
249 | #----------------------------------------------------------------------------------------------- | ||
250 | |||
251 | install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ | ||
252 | - DESTINATION "runtime/include" | ||
253 | + DESTINATION "include" | ||
254 | COMPONENT core_dev | ||
255 | FILES_MATCHING | ||
256 | PATTERN "*.hpp" | ||
257 | @@ -143,5 +143,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake | ||
258 | |||
259 | install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake | ||
260 | ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake | ||
261 | - DESTINATION "runtime/cmake" | ||
262 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
263 | COMPONENT core_dev) | ||
264 | diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt | ||
265 | index 737e7e0027..259d5e141d 100644 | ||
266 | --- a/src/inference/CMakeLists.txt | ||
267 | +++ b/src/inference/CMakeLists.txt | ||
268 | @@ -209,7 +209,7 @@ set_target_properties(${TARGET_NAME}_obj | ||
269 | |||
270 | openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api) | ||
271 | |||
272 | -install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include | ||
273 | +install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include | ||
274 | COMPONENT core_dev) | ||
275 | |||
276 | # Install static libraries for case BUILD_SHARED_LIBS=OFF | ||
277 | diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
278 | index 3993bd9731..99287bad51 100644 | ||
279 | --- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
280 | +++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
281 | @@ -94,7 +94,7 @@ add_custom_command( | ||
282 | COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json) | ||
283 | |||
284 | install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json | ||
285 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
286 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
287 | COMPONENT gpu) | ||
288 | |||
289 | ov_install_static_lib(${TARGET_NAME} gpu) | ||
290 | diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
291 | index 480acc05d1..5849f55878 100644 | ||
292 | --- a/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
293 | +++ b/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
294 | @@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES) | ||
295 | VERBATIM) | ||
296 | |||
297 | install(FILES ${${var_name}} | ||
298 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
299 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
300 | COMPONENT myriad) | ||
301 | |||
302 | if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS) | ||
303 | diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
304 | index d8ebea0bfc..66b5a3d462 100644 | ||
305 | --- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
306 | +++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
307 | @@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | ||
308 | |||
309 | if(LINUX) | ||
310 | install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules | ||
311 | - DESTINATION install_dependencies | ||
312 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
313 | COMPONENT myriad) | ||
314 | endif() | ||
315 | diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt | ||
316 | index 2fe0fd9742..234110b7d4 100644 | ||
317 | --- a/tools/CMakeLists.txt | ||
318 | +++ b/tools/CMakeLists.txt | ||
319 | @@ -20,7 +20,7 @@ endif() | ||
320 | ie_cpack_add_component(deployment_manager REQUIRED) | ||
321 | |||
322 | install(DIRECTORY deployment_manager | ||
323 | - DESTINATION tools | ||
324 | + DESTINATION share/openvino/tools | ||
325 | COMPONENT deployment_manager | ||
326 | USE_SOURCE_PERMISSIONS) | ||
327 | |||
328 | diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt | ||
329 | index d19eb5cc14..9fc929cbb0 100644 | ||
330 | --- a/tools/compile_tool/CMakeLists.txt | ||
331 | +++ b/tools/compile_tool/CMakeLists.txt | ||
332 | @@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
333 | ie_cpack_add_component(core_tools DEPENDS core) | ||
334 | |||
335 | install(TARGETS compile_tool | ||
336 | - RUNTIME DESTINATION tools/compile_tool | ||
337 | + RUNTIME DESTINATION bin | ||
338 | COMPONENT core_tools) | ||
339 | |||
340 | -install(FILES README.md | ||
341 | - DESTINATION tools/compile_tool | ||
342 | - COMPONENT core_tools) | ||
343 | +#install(FILES README.md | ||
344 | +# DESTINATION tools/compile_tool | ||
345 | +# COMPONENT core_tools) | ||
346 | -- | ||
347 | 2.37.3 | ||
348 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch deleted file mode 100644 index ffb0f95d..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From a817386f1d0539a040fbdc02853a73bbcdddf1f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Fri, 30 Sep 2022 20:26:04 +0800 | ||
4 | Subject: [PATCH] Fix build issues due to gflag and zlib | ||
5 | |||
6 | Change gflag to shared as we are not building with static library. | ||
7 | We are using zlib from host, so don't add zlib as third party package | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
12 | --- | ||
13 | thirdparty/CMakeLists.txt | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
17 | index 4cba1588fe..f82bf3148b 100644 | ||
18 | --- a/thirdparty/CMakeLists.txt | ||
19 | +++ b/thirdparty/CMakeLists.txt | ||
20 | @@ -39,7 +39,7 @@ if(NOT CMAKE_CROSSCOMPILING) | ||
21 | endif() | ||
22 | |||
23 | if(NOT zlib_FOUND) | ||
24 | - add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||
25 | + #add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||
26 | endif() | ||
27 | |||
28 | # | ||
29 | @@ -85,7 +85,7 @@ ov_install_static_lib(fluid openvino_common) | ||
30 | |||
31 | if(NOT APPLE) | ||
32 | # on Apple only dynamic libraries are available | ||
33 | - find_package(gflags QUIET COMPONENTS nothreads_static) | ||
34 | + find_package(gflags QUIET COMPONENTS nothreads_shared) | ||
35 | endif() | ||
36 | |||
37 | if(gflags_FOUND) | ||
38 | -- | ||
39 | 2.37.3 | ||
40 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch new file mode 100644 index 00000000..e0967d55 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:49:35 +0530 | ||
4 | Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error | ||
5 | |||
6 | * Remove -Werror for: | ||
7 | |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] | ||
8 | | 129 | virtual JitDefinitions GetDefinitions() const = 0; | ||
9 | | | | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | src/plugins/intel_gpu/CMakeLists.txt | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt | ||
19 | index b0c66a435d6..a3037147cc2 100644 | ||
20 | --- a/src/plugins/intel_gpu/CMakeLists.txt | ||
21 | +++ b/src/plugins/intel_gpu/CMakeLists.txt | ||
22 | @@ -38,7 +38,7 @@ add_subdirectory(thirdparty) | ||
23 | include(thirdparty/cmake/rapidjson.cmake) | ||
24 | |||
25 | if(CMAKE_COMPILER_IS_GNUCXX) | ||
26 | - ov_add_compiler_flags(-Werror) | ||
27 | + #ov_add_compiler_flags(-Werror) | ||
28 | endif() | ||
29 | |||
30 | add_subdirectory(src/runtime) | ||
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch new file mode 100644 index 00000000..59095133 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:55:19 +0530 | ||
4 | Subject: [PATCH 4/4] protobuf: allow target protoc to be built | ||
5 | |||
6 | We can run target binaries using a qemu wrapper so allow these to be | ||
7 | built and run. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
14 | thirdparty/protobuf/CMakeLists.txt | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
18 | index 49c5b881030..2a1ea8562bc 100644 | ||
19 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
20 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
21 | @@ -143,7 +143,7 @@ macro(ov_add_frontend) | ||
22 | set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) | ||
23 | add_custom_command( | ||
24 | OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" | ||
25 | - COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
26 | + COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
27 | DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} | ||
28 | COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" | ||
29 | VERBATIM | ||
30 | diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt | ||
31 | index 4b6d6da87f3..409e492a5b3 100644 | ||
32 | --- a/thirdparty/protobuf/CMakeLists.txt | ||
33 | +++ b/thirdparty/protobuf/CMakeLists.txt | ||
34 | @@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen | ||
35 | if(CMAKE_CROSSCOMPILING OR | ||
36 | (APPLE AND (HOST_X86_64 AND AARCH64)) OR | ||
37 | (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) | ||
38 | - set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) | ||
39 | + set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
40 | else() | ||
41 | set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
42 | endif() | ||
43 | -- | ||
44 | 2.34.1 | ||
45 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch deleted file mode 100644 index 45ed0d27..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Change the working directory to source to workaround cython | ||
2 | embedding absolute path to the pyx file in output. | ||
3 | |||
4 | Upstream-Status: Inappropriate [OE build specific] | ||
5 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
6 | |||
7 | diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake | ||
8 | index f14662ad50..8d199fe328 100644 | ||
9 | --- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake | ||
10 | +++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake | ||
11 | @@ -259,7 +259,7 @@ function( compile_pyx _name generated_file ) | ||
12 | add_custom_command( OUTPUT ${_generated_file} | ||
13 | COMMAND ${CYTHON_EXECUTABLE} | ||
14 | ARGS ${cxx_arg} ${include_directory_arg} ${version_arg} | ||
15 | - ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} | ||
16 | + ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -w ${CMAKE_CURRENT_SOURCE_DIR} | ||
17 | --output-file ${_generated_file} ${pyx_locations} | ||
18 | DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies} | ||
19 | IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies} | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch index 2b608050..816a98a3 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fe3e1d923399da1d71458f5c468563b61784380c Mon Sep 17 00:00:00 2001 | 1 | From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001 |
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
3 | Date: Fri, 21 Oct 2022 11:38:23 +0800 | 3 | Date: Fri, 21 Oct 2022 11:38:23 +0800 |
4 | Subject: [PATCH] demos: use gflags from meta-oe | 4 | Subject: [PATCH] demos: use gflags from meta-oe |
@@ -7,23 +7,21 @@ Upstream-Status: Inappropriate | |||
7 | 7 | ||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
9 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 9 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
10 | |||
10 | --- | 11 | --- |
11 | demos/CMakeLists.txt | 2 +- | 12 | demos/CMakeLists.txt | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 14 | ||
14 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt | 15 | diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt |
15 | index 1484a50d5..996934310 100644 | 16 | index 51767051c..fb7e3d22f 100644 |
16 | --- a/demos/CMakeLists.txt | 17 | --- a/demos/CMakeLists.txt |
17 | +++ b/demos/CMakeLists.txt | 18 | +++ b/demos/CMakeLists.txt |
18 | @@ -140,7 +140,7 @@ endmacro() | 19 | @@ -141,7 +141,7 @@ endmacro() |
19 | find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) | 20 | find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) |
20 | find_package(OpenVINO REQUIRED COMPONENTS Runtime) | 21 | find_package(OpenVINO REQUIRED COMPONENTS Runtime) |
21 | 22 | ||
22 | -add_subdirectory(thirdparty/gflags) | 23 | -add_subdirectory(thirdparty/gflags) |
23 | +#add_subdirectory(thirdparty/gflags) | 24 | +#add_subdirectory(thirdparty/gflags) |
24 | add_subdirectory(common/cpp) | 25 | add_subdirectory(common/cpp) |
25 | # TODO: remove wrapping if after OpenCV3 is dropped | 26 | |
26 | if(OpenCV_VERSION VERSION_GREATER_EQUAL 4.5.3) | 27 | find_package(OpenCV QUIET COMPONENTS gapi) |
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb index fc56ba69..4c322f04 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb | |||
@@ -4,11 +4,11 @@ DESCRIPTION = "This repository includes optimized deep learning \ | |||
4 | models and a set of demos to expedite development of high-performance \ | 4 | models and a set of demos to expedite development of high-performance \ |
5 | deep learning inference applications." | 5 | deep learning inference applications." |
6 | 6 | ||
7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=releases/2022/2 \ | 7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \ |
8 | file://0001-use-oe-gflags.patch \ | 8 | file://0001-use-oe-gflags.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79" | 11 | SRCREV = "37f60eb7fe1dcdedc552b2fb184d646723ed5e80" |
12 | 12 | ||
13 | LICENSE = "Apache-2.0" | 13 | LICENSE = "Apache-2.0" |
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |
@@ -44,11 +44,11 @@ do_install(){ | |||
44 | install -d ${D}${bindir} | 44 | install -d ${D}${bindir} |
45 | install -d ${D}${datadir}/openvino/open-model-zoo/tools | 45 | install -d ${D}${datadir}/openvino/open-model-zoo/tools |
46 | install -d ${D}${datadir}/openvino/open-model-zoo/demos | 46 | install -d ${D}${datadir}/openvino/open-model-zoo/demos |
47 | cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir} | 47 | cp -rf ${B}/intel64/Release/*.a ${D}${libdir} |
48 | cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} | 48 | cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir} |
49 | cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo | 49 | cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo |
50 | cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo | 50 | cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo |
51 | cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools | 51 | cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools |
52 | } | 52 | } |
53 | 53 | ||
54 | FILES:${PN} += "${datadir}/openvino" | 54 | FILES:${PN} += "${datadir}/openvino" |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb deleted file mode 100644 index 2853100e..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb +++ /dev/null | |||
@@ -1,144 +0,0 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/2;lfs=0 \ | ||
8 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_20220307_34.zip;name=usb_ma2x8x \ | ||
9 | https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_20220307_34.zip;name=pcie_ma2x8x \ | ||
10 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ | ||
11 | git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ | ||
12 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ | ||
13 | git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \ | ||
14 | git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \ | ||
15 | git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \ | ||
16 | git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/2 \ | ||
17 | file://0001-Use-system-installed-dependencies.patch \ | ||
18 | file://0002-Fix-installation-of-binaries-and-libraries.patch \ | ||
19 | file://0003-Fix-build-issues-due-to-gflag-and-zlib.patch \ | ||
20 | file://cython-cmake.patch \ | ||
21 | " | ||
22 | |||
23 | SRCREV = "af16ea1d79a494503a54cff67a2856094e447931" | ||
24 | SRCREV_mkl = "2a749c577f8a841a396d4bd46eaf311b7e7dc089" | ||
25 | SRCREV_onednn = "efbf9b5e8c12666314f3484ce279cee0a1a91a44" | ||
26 | SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9" | ||
27 | SRCREV_pybind11 = "aa304c9c7d725ffb9d10af08a3b34cb372307020" | ||
28 | SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c" | ||
29 | SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1" | ||
30 | SRCREV_omz = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79" | ||
31 | |||
32 | SRC_URI[usb_ma2x8x.sha256sum] = "877c4e1616d14a94dd2764f4f32f1c1aa2180dcd64ad1823b31efdc3f56ad593" | ||
33 | SRC_URI[pcie_ma2x8x.sha256sum] = "aabff3d817431792ef9e17056448979c2cdbb484ad4b0af9e68cb874ee10eef5" | ||
34 | |||
35 | LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" | ||
36 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
37 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | ||
38 | file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ | ||
39 | file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \ | ||
40 | file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \ | ||
41 | file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
42 | file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ | ||
43 | file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ | ||
44 | file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \ | ||
45 | " | ||
46 | |||
47 | inherit cmake python3native | ||
48 | |||
49 | S = "${WORKDIR}/git" | ||
50 | EXTRA_OECMAKE += " \ | ||
51 | -DENABLE_OPENCV=OFF \ | ||
52 | -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \ | ||
53 | -DENABLE_PLUGIN_RPATH=0 \ | ||
54 | -DENABLE_INTEL_GNA=OFF \ | ||
55 | -DENABLE_SYSTEM_TBB=ON \ | ||
56 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
57 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
58 | -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ | ||
59 | -DENABLE_SAMPLES=ON \ | ||
60 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
61 | -DENABLE_DATA=FALSE \ | ||
62 | -DENABLE_SYSTEM_PUGIXML=TRUE \ | ||
63 | -DENABLE_SYSTEM_PROTOBUF=TRUE \ | ||
64 | -DProtobuf_LIBRARIES=protobuf \ | ||
65 | -DProtobuf_LITE_LIBRARIES=protobuf-lite \ | ||
66 | -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \ | ||
67 | -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \ | ||
68 | -DENABLE_OV_ONNX_FRONTEND=FALSE \ | ||
69 | -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ | ||
70 | " | ||
71 | |||
72 | DEPENDS += "libusb1 \ | ||
73 | ade \ | ||
74 | opencv \ | ||
75 | pugixml \ | ||
76 | protobuf \ | ||
77 | protobuf-native \ | ||
78 | tbb \ | ||
79 | zlib \ | ||
80 | " | ||
81 | |||
82 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
83 | COMPATIBLE_HOST:libc-musl = "null" | ||
84 | |||
85 | PACKAGECONFIG ?= "vpu opencl" | ||
86 | PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva," | ||
87 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython" | ||
88 | PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware" | ||
89 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
90 | |||
91 | do_configure:prepend() { | ||
92 | # Dont set PROJECT_ROOT_DIR | ||
93 | sed -i -e 's:\${CMAKE_CURRENT_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt | ||
94 | } | ||
95 | |||
96 | do_install:append() { | ||
97 | if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then | ||
98 | install -d ${D}${datadir}/openvino | ||
99 | mv ${D}/usr/samples/python ${D}${datadir}/openvino/ | ||
100 | |||
101 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | ||
102 | mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
103 | mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/ | ||
104 | |||
105 | rm -rf ${D}${prefix}/python | ||
106 | fi | ||
107 | |||
108 | rm -rf ${D}${prefix}/deployment_tools | ||
109 | |||
110 | # Remove the samples source directory. We install the built samples. | ||
111 | rm -rf ${D}/usr/samples | ||
112 | |||
113 | sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp | ||
114 | } | ||
115 | |||
116 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
117 | # instead of RSS | ||
118 | SSTATE_SCAN_FILES:append = " *.cmake" | ||
119 | |||
120 | FILES:${PN}-dev = "${includedir} \ | ||
121 | ${libdir}/cmake \ | ||
122 | " | ||
123 | |||
124 | FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ | ||
125 | ${datadir}/openvino \ | ||
126 | ${libdir}/custom_kernels \ | ||
127 | ${libdir}/plugins.xml \ | ||
128 | ${libdir}/cache.json \ | ||
129 | " | ||
130 | |||
131 | # Move inference engine samples into a separate package | ||
132 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" | ||
133 | |||
134 | FILES:${PN}-samples = "${datadir}/openvino \ | ||
135 | ${bindir} \ | ||
136 | " | ||
137 | FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" | ||
138 | |||
139 | # Package for inference engine python API | ||
140 | PACKAGES =+ "${PN}-${PYTHON_PN}" | ||
141 | |||
142 | FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" | ||
143 | |||
144 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb new file mode 100644 index 00000000..94edd1b8 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb | |||
@@ -0,0 +1,143 @@ | |||
1 | SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit" | ||
2 | HOMEPAGE = "https://github.com/opencv/dldt" | ||
3 | DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ | ||
4 | deep learning models through a high-level C++ Inference Engine API \ | ||
5 | integrated with application logic." | ||
6 | |||
7 | SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/0;lfs=0 \ | ||
8 | git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ | ||
9 | git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ | ||
10 | git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ | ||
11 | git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ | ||
12 | git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ | ||
13 | git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ | ||
14 | git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \ | ||
15 | git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \ | ||
16 | git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \ | ||
17 | git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \ | ||
18 | git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \ | ||
19 | file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ | ||
20 | file://0003-cmake-Fix-overloaded-virtual-error.patch \ | ||
21 | file://0004-protobuf-allow-target-protoc-to-be-built.patch \ | ||
22 | file://0001-cmake-fix-build-when-using-sysroot.patch \ | ||
23 | file://0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch \ | ||
24 | " | ||
25 | |||
26 | SRCREV_openvino = "34caeefd07800b59065345d651949efbe8ab6649" | ||
27 | SRCREV_mkl = "f82148befdbdc9576ec721c9d500155ee4de8060" | ||
28 | SRCREV_onednn = "494af5f9921bdae98f1a0e2955fa7d76ff386c4f" | ||
29 | SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" | ||
30 | SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" | ||
31 | SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" | ||
32 | SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" | ||
33 | SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" | ||
34 | SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851" | ||
35 | SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94" | ||
36 | SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488" | ||
37 | SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d" | ||
38 | SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas" | ||
39 | |||
40 | LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" | ||
41 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
42 | file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \ | ||
43 | file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \ | ||
44 | file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \ | ||
45 | file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
46 | file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \ | ||
47 | file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \ | ||
48 | file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | ||
49 | file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ | ||
50 | file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ | ||
51 | file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \ | ||
52 | file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \ | ||
53 | " | ||
54 | |||
55 | inherit cmake python3native pkgconfig qemu | ||
56 | |||
57 | S = "${WORKDIR}/git" | ||
58 | EXTRA_OECMAKE += " \ | ||
59 | -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ | ||
60 | -DENABLE_OPENCV=OFF \ | ||
61 | -DENABLE_INTEL_GNA=OFF \ | ||
62 | -DENABLE_SYSTEM_TBB=ON \ | ||
63 | -DPYTHON_EXECUTABLE=${PYTHON} \ | ||
64 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
65 | -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \ | ||
66 | -DTREAT_WARNING_AS_ERROR=FALSE \ | ||
67 | -DENABLE_DATA=FALSE \ | ||
68 | -DENABLE_SYSTEM_PUGIXML=TRUE \ | ||
69 | -DENABLE_OV_ONNX_FRONTEND=FALSE \ | ||
70 | -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ | ||
71 | -DENABLE_FUZZING=OFF \ | ||
72 | -DENABLE_TBBBIND_2_5=OFF \ | ||
73 | -DCPACK_GENERATOR=RPM \ | ||
74 | -DENABLE_SYSTEM_FLATBUFFERS=ON \ | ||
75 | -DENABLE_SYSTEM_SNAPPY=ON \ | ||
76 | -DFETCHCONTENT_BASE_DIR="${S}" \ | ||
77 | " | ||
78 | |||
79 | DEPENDS += "\ | ||
80 | flatbuffers-native \ | ||
81 | pugixml \ | ||
82 | python3-pybind11 \ | ||
83 | python3-pybind11-native \ | ||
84 | qemu-native \ | ||
85 | snappy \ | ||
86 | tbb \ | ||
87 | " | ||
88 | |||
89 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
90 | COMPATIBLE_HOST:libc-musl = "null" | ||
91 | |||
92 | PACKAGECONFIG ?= "opencl samples" | ||
93 | PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp," | ||
94 | PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress" | ||
95 | PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv" | ||
96 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | ||
97 | |||
98 | do_configure:prepend() { | ||
99 | # Dont set PROJECT_ROOT_DIR | ||
100 | sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt | ||
101 | |||
102 | # qemu wrapper that can be used by cmake to run target binaries. | ||
103 | qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" | ||
104 | cat > ${WORKDIR}/qemuwrapper << EOF | ||
105 | #!/bin/sh | ||
106 | $qemu_binary "\$@" | ||
107 | EOF | ||
108 | chmod +x ${WORKDIR}/qemuwrapper | ||
109 | } | ||
110 | |||
111 | do_install:append() { | ||
112 | rm -rf ${D}${prefix}/install_dependencies | ||
113 | rm -rf ${D}${prefix}/setupvars.sh | ||
114 | |||
115 | find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} + | ||
116 | } | ||
117 | |||
118 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | ||
119 | # instead of RSS | ||
120 | SSTATE_SCAN_FILES:append = " *.cmake" | ||
121 | |||
122 | FILES:${PN} += "\ | ||
123 | ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \ | ||
124 | ${libdir}/openvino-${PV}/plugins.xml \ | ||
125 | ${libdir}/openvino-${PV}/cache.json \ | ||
126 | " | ||
127 | |||
128 | # Move inference engine samples into a separate package | ||
129 | PACKAGES =+ "${PN}-samples" | ||
130 | |||
131 | FILES:${PN}-samples = "${datadir}/openvino \ | ||
132 | ${bindir} \ | ||
133 | ${libdir}/libformat_reader.a \ | ||
134 | ${libdir}/libopencv_c_wrapper.a \ | ||
135 | " | ||
136 | RDEPENDS:${PN}-samples += "python3-core" | ||
137 | |||
138 | # Package for inference engine python API | ||
139 | PACKAGES =+ "${PN}-python3" | ||
140 | |||
141 | FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" | ||
142 | |||
143 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$" | ||
diff --git a/lib/oeqa/runtime/cases/jhi.py b/lib/oeqa/runtime/cases/jhi.py deleted file mode 100644 index 7a24b6da..00000000 --- a/lib/oeqa/runtime/cases/jhi.py +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | import os | ||
2 | from oeqa.runtime.decorator.package import OEHasPackage | ||
3 | from oeqa.runtime.case import OERuntimeTestCase | ||
4 | from oeqa.core.decorator.depends import OETestDepends | ||
5 | |||
6 | class JhiTest(OERuntimeTestCase): | ||
7 | |||
8 | @classmethod | ||
9 | def tearDownClass(cls): | ||
10 | _, output = cls.tc.target.run('pidof jhid') | ||
11 | cls.tc.target.run('kill %s' % output) | ||
12 | |||
13 | @OEHasPackage(['openssh-sshd']) | ||
14 | @OEHasPackage(['jhi']) | ||
15 | def test_jhi_mei_driver(self): | ||
16 | command = 'ls /dev/mei*' | ||
17 | (status, output) = self.target.run(command) | ||
18 | self.assertEqual(status, 0, msg="Error messages: %s" % output) | ||
19 | |||
20 | @OETestDepends(['jhi.JhiTest.test_jhi_mei_driver']) | ||
21 | def test_jhi_daemon_version(self): | ||
22 | command = 'jhid -v' | ||
23 | (status, output) = self.target.run(command) | ||
24 | self.assertEqual(status, 0, msg="Error messages: %s" % output) | ||
25 | |||
26 | @OETestDepends(['jhi.JhiTest.test_jhi_mei_driver']) | ||
27 | def test_jhi_daemon_can_initialized(self): | ||
28 | command = 'jhid -d' | ||
29 | (status, output) = self.target.run(command) | ||
30 | self.assertEqual(status, 0, msg="Error messages: %s" % output) | ||
31 | |||
32 | @OEHasPackage(['jhi-test']) | ||
33 | @OETestDepends(['jhi.JhiTest.test_jhi_daemon_can_initialized']) | ||
34 | def test_jhi_bist(self): | ||
35 | (status, output) = self.target.run('uname -m') | ||
36 | self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output)) | ||
37 | if 'x86_64' not in output: | ||
38 | self.skipTest("Skipped jhi bist test if not x86_64 machine (current machine: %s)." % output) | ||
39 | command = 'bist' | ||
40 | (status, output) = self.target.run(command) | ||
41 | self.assertEqual(status, 0, msg="Error messages: %s" % output) | ||
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt new file mode 100644 index 00000000..84ce8168 --- /dev/null +++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-core2-32.txt | |||
@@ -0,0 +1,9 @@ | |||
1 | # These should be reviewed to see if they are still needed | ||
2 | ACPI: No _BQC method, cannot determine initial brightness | ||
3 | [Firmware Bug]: ACPI: No _BQC method, cannot determine initial brightness | ||
4 | (EE) Failed to load module "psb" | ||
5 | (EE) Failed to load module "psbdrv" | ||
6 | (EE) open /dev/fb0: No such file or directory | ||
7 | (EE) AIGLX: reverting to software rendering | ||
8 | dmi: Firmware registration failed. | ||
9 | ioremap error for 0x78 | ||
diff --git a/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt new file mode 100644 index 00000000..5c9b4bc7 --- /dev/null +++ b/lib/oeqa/runtime/cases/parselogs-ignores-intel-corei7-64.txt | |||
@@ -0,0 +1,14 @@ | |||
1 | # These should be reviewed to see if they are still needed | ||
2 | can't set Max Payload Size to 256 | ||
3 | intel_punit_ipc: can't request region for resource | ||
4 | [drm] parse error at position 4 in video mode 'efifb' | ||
5 | ACPI Error: Could not enable RealTimeClock event | ||
6 | ACPI Warning: Could not enable fixed event - RealTimeClock | ||
7 | hci_intel INT33E1:00: Unable to retrieve gpio | ||
8 | hci_intel: probe of INT33E1:00 failed | ||
9 | can't derive routing for PCI INT A | ||
10 | failed to read out thermal zone | ||
11 | Bluetooth: hci0: Setting Intel event mask failed | ||
12 | ttyS2 - failed to request DMA | ||
13 | Bluetooth: hci0: Failed to send firmware data (-38) | ||
14 | atkbd serio0: Failed to enable keyboard on isa0060/serio0 | ||
diff --git a/recipes-bsp/intel-cmt-cat/intel-cmt-cat_23.11.1.bb b/recipes-bsp/intel-cmt-cat/intel-cmt-cat_23.11.1.bb new file mode 100644 index 00000000..60d0dfd2 --- /dev/null +++ b/recipes-bsp/intel-cmt-cat/intel-cmt-cat_23.11.1.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "intel-cmt-cat" | ||
2 | DESCRIPTION = "Software package which provides basic support for Intel(R) \ | ||
3 | Resource Director Technology (Intel(R) RDT)" | ||
4 | HOMEPAGE = "https://github.com/intel/intel-cmt-cat" | ||
5 | |||
6 | LICENSE = "BSD-3-Clause" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4b63c65942e1c16fd897f8cd20abebf8" | ||
8 | |||
9 | SRC_URI = "git://github.com/intel/intel-cmt-cat;protocol=https;branch=master" | ||
10 | SRCREV = "b26b31b0ae6980c5939a421cefe0316cae884626" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | COMPATIBLE_HOST = '(x86_64).*-linux' | ||
15 | COMPATIBLE_HOST:libc-musl = "null" | ||
16 | |||
17 | do_install() { | ||
18 | oe_runmake install PREFIX=${D}${prefix} NOLDCONFIG=y | ||
19 | } | ||
20 | |||
21 | FILES:${PN} += "${nonarch_libdir}/libpqos*" | ||
22 | FILES:${PN}-doc = "/usr/man*" | ||
23 | |||
24 | INSANE_SKIP:${PN} += "ldflags" | ||
25 | INSANE_SKIP:${PN} += "dev-so" | ||
26 | INSANE_SKIP:${PN} += "libdir" | ||
27 | INSANE_SKIP:${PN} += "already-stripped" | ||
28 | |||
29 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||
diff --git a/recipes-bsp/metee/metee_3.1.3.bb b/recipes-bsp/metee/metee_3.2.4.bb index 99f72abb..da8220b9 100644 --- a/recipes-bsp/metee/metee_3.1.3.bb +++ b/recipes-bsp/metee/metee_3.2.4.bb | |||
@@ -10,8 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | |||
10 | 10 | ||
11 | inherit cmake | 11 | inherit cmake |
12 | 12 | ||
13 | SRC_URI = "git://github.com/intel/metee.git;branch=master;protocol=https" | 13 | SRC_URI = "git://github.com/intel/metee.git;branch=master;protocol=https \ |
14 | SRCREV = "0d6f19420bebaa92b0e3dcb6b81e352820f1f1cc" | 14 | " |
15 | SRCREV = "db45e37e146fd9c06907a15ade55eba06ad1f951" | ||
15 | 16 | ||
16 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
17 | 18 | ||
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb index 31e9344b..df459d72 100644 --- a/recipes-core/libxcam/libxcam_1.5.0.bb +++ b/recipes-core/libxcam/libxcam_1.5.0.bb | |||
@@ -30,7 +30,7 @@ PACKAGECONFIG[dnn] = "--enable-dnn, --disable-dnn," | |||
30 | 30 | ||
31 | do_install:append () { | 31 | do_install:append () { |
32 | install -d ${D}${bindir}/libxcam | 32 | install -d ${D}${bindir}/libxcam |
33 | cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ | 33 | cp -r ${B}/tests/.libs/* ${D}${bindir}/libxcam/ |
34 | } | 34 | } |
35 | 35 | ||
36 | FILES:${PN} += "${libdir}/gstreamer-*/*.so" | 36 | FILES:${PN} += "${libdir}/gstreamer-*/*.so" |
diff --git a/recipes-core/microcode/intel-microcode_20221108.bb b/recipes-core/microcode/intel-microcode_20240312.bb index 16b05484..00b18231 100644 --- a/recipes-core/microcode/intel-microcode_20221108.bb +++ b/recipes-core/microcode/intel-microcode_20240312.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721" | |||
16 | SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \ | 16 | SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV = "262f0c97f2fbc3839a59523cc6c6bcf500e2850b" | 19 | SRCREV = "41af34500598418150aa298bb04e7edacc547897" |
20 | 20 | ||
21 | DEPENDS = "iucode-tool-native" | 21 | DEPENDS = "iucode-tool-native" |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
diff --git a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch index 6065b1f7..7eb3bc69 100644 --- a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch +++ b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch | |||
@@ -9,6 +9,8 @@ application. It's used for testing purposes only. | |||
9 | 9 | ||
10 | Images signed with refkit-db keys are allowed to boot. | 10 | Images signed with refkit-db keys are allowed to boot. |
11 | 11 | ||
12 | Upstream-Status: Inappropriate | ||
13 | |||
12 | Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> | 14 | Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> |
13 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 15 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
14 | --- | 16 | --- |
diff --git a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch new file mode 100644 index 00000000..825c1f18 --- /dev/null +++ b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 8729d66800995a9b7e693bd78249932bd12383e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: John Machado <john.machado@intel.com> | ||
3 | Date: Mon, 25 Mar 2024 11:13:27 +0530 | ||
4 | Subject: [PATCH] Add new DG2 device IDs (#194) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/dcc4b85ea3728c848b62fbb164c00f43b519b6fb] | ||
7 | |||
8 | Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
9 | --- | ||
10 | Source/inc/common/igfxfmid.h | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h | ||
14 | index 7969779..8e2c955 100644 | ||
15 | --- a/Source/inc/common/igfxfmid.h | ||
16 | +++ b/Source/inc/common/igfxfmid.h | ||
17 | @@ -1932,6 +1932,8 @@ typedef enum __NATIVEGTTYPE | ||
18 | #define DEV_ID_56BB 0x56BB | ||
19 | #define DEV_ID_56BC 0x56BC | ||
20 | #define DEV_ID_56BD 0x56BD | ||
21 | +#define DEV_ID_56BE 0x56BE | ||
22 | +#define DEV_ID_56BF 0x56BF | ||
23 | #define DEV_ID_56C0 0x56C0 | ||
24 | #define DEV_ID_56C1 0x56C1 | ||
25 | |||
26 | @@ -1992,6 +1994,8 @@ typedef enum __NATIVEGTTYPE | ||
27 | ( d == DEV_ID_5690 ) || \ | ||
28 | ( d == DEV_ID_5691 ) || \ | ||
29 | ( d == DEV_ID_5692 ) || \ | ||
30 | + ( d == DEV_ID_56BE ) || \ | ||
31 | + ( d == DEV_ID_56BF ) || \ | ||
32 | ( d == DEV_ID_56C0 ) || \ | ||
33 | ( d == DEV_ID_4F80 ) || \ | ||
34 | ( d == DEV_ID_4F81 ) || \ | ||
35 | -- | ||
36 | 2.34.1 | ||
37 | |||
diff --git a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch new file mode 100644 index 00000000..ab4cb178 --- /dev/null +++ b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001 | ||
2 | From: John Machado <john.machado@intel.com> | ||
3 | Date: Fri, 9 Feb 2024 13:10:18 +0530 | ||
4 | Subject: [PATCH] Introduce ARL-H support (#172) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179] | ||
7 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
8 | --- | ||
9 | Source/inc/common/igfxfmid.h | 10 ++++++++++ | ||
10 | 1 file changed, 10 insertions(+) | ||
11 | |||
12 | diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h | ||
13 | index 99fc624..19aa505 100644 | ||
14 | --- a/Source/inc/common/igfxfmid.h | ||
15 | +++ b/Source/inc/common/igfxfmid.h | ||
16 | @@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE | ||
17 | // ARL-S | ||
18 | #define DEV_ID_7D67 0x7D67 | ||
19 | |||
20 | +// ARL-H | ||
21 | +#define DEV_ID_7D41 0x7D41 | ||
22 | +#define DEV_ID_7D51 0x7D51 | ||
23 | +#define DEV_ID_7DD1 0x7DD1 | ||
24 | + | ||
25 | #define MGM_HAS 0 | ||
26 | |||
27 | //#define SDG_HAS 1 //Reserve place for Springdale-G HAS | ||
28 | @@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE | ||
29 | // Macro to identify ARL-S Device ID | ||
30 | #define GFX_IS_ARL_S(d) ( ( d == DEV_ID_7D67 ) ) | ||
31 | |||
32 | +// Macro to identify ARL-H Device ID | ||
33 | +#define GFX_IS_ARL_H(d) ( ( d == DEV_ID_7D41 ) || \ | ||
34 | + ( d == DEV_ID_7D51 ) || \ | ||
35 | + ( d == DEV_ID_7DD1 )) | ||
36 | + | ||
37 | //we define the highest cap and lower cap of stepping IDs | ||
38 | #define SI_REV_ID(lo,hi) (lo | hi<<16) | ||
39 | |||
40 | -- | ||
41 | 2.40.1 | ||
42 | |||
diff --git a/recipes-graphics/gmmlib/gmmlib_22.2.0.bb b/recipes-graphics/gmmlib/gmmlib_22.3.15.bb index 287e1113..875fbaf5 100644 --- a/recipes-graphics/gmmlib/gmmlib_22.2.0.bb +++ b/recipes-graphics/gmmlib/gmmlib_22.3.15.bb | |||
@@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654" | |||
8 | 8 | ||
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
10 | git://github.com/intel/gmmlib.git;protocol=https;branch=master \ | 10 | git://github.com/intel/gmmlib.git;protocol=https;branch=master \ |
11 | file://0001-Introduce-ARL-H-support-172.patch \ | ||
12 | file://0001-Add-new-DG2-device-IDs-194.patch \ | ||
11 | " | 13 | " |
12 | 14 | ||
13 | SRCREV = "506c8e1bb50fa3f10c52ec01e545725df4f6af47" | 15 | SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc" |
14 | 16 | ||
15 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
16 | 18 | ||
diff --git a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch index f07d466f..6d32da43 100644 --- a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch +++ b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch | |||
@@ -9,7 +9,7 @@ exits, which causing hdcpd service failure. | |||
9 | Added wait function to block parent process | 9 | Added wait function to block parent process |
10 | until child process exits. | 10 | until child process exits. |
11 | 11 | ||
12 | Upstream-Status: Submitted[https://github.com/intel/hdcp/pull/17] | 12 | Upstream-Status: Submitted [https://github.com/intel/hdcp/pull/17] |
13 | 13 | ||
14 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 14 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
15 | --- | 15 | --- |
diff --git a/recipes-graphics/libva/libva-intel-utils_2.16.0.bb b/recipes-graphics/libva/libva-intel-utils_2.20.1.bb index 1ddfb53d..9c26f009 100644 --- a/recipes-graphics/libva/libva-intel-utils_2.16.0.bb +++ b/recipes-graphics/libva/libva-intel-utils_2.20.1.bb | |||
@@ -14,8 +14,8 @@ SECTION = "x11" | |||
14 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" | 15 | LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.16-branch;protocol=https" | 17 | SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https" |
18 | SRCREV = "cdf39e1e3da85a91ef53438c3b6a97e77dda96aa" | 18 | SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8" |
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
21 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 21 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
diff --git a/recipes-graphics/libva/libva-intel_2.16.0.bb b/recipes-graphics/libva/libva-intel_2.20.0.bb index 3077a7e8..c81ed65c 100644 --- a/recipes-graphics/libva/libva-intel_2.16.0.bb +++ b/recipes-graphics/libva/libva-intel_2.20.0.bb | |||
@@ -17,8 +17,9 @@ SECTION = "x11" | |||
17 | LICENSE = "MIT" | 17 | LICENSE = "MIT" |
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" | 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" |
19 | 19 | ||
20 | SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" | 20 | SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 \ |
21 | SRC_URI[sha256sum] = "115faca0db2c417a37da49830870e260450fa13066f5e24e252a20c36d920a1c" | 21 | " |
22 | SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49" | ||
22 | 23 | ||
23 | S = "${WORKDIR}/libva-${PV}" | 24 | S = "${WORKDIR}/libva-${PV}" |
24 | 25 | ||
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb index 30b9d7be..3ed1c9bd 100644 --- a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.158.bb +++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb | |||
@@ -8,7 +8,7 @@ SECTION = "lib" | |||
8 | inherit pkgconfig cmake | 8 | inherit pkgconfig cmake |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | SRCREV = "24a1726b50aae8bb689381b9c293a617f4d7b0da" | 11 | SRCREV = "75b292eb1309e4ea10dce403065ee8ca5bf29ecc" |
12 | SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \ |
13 | " | 13 | " |
14 | 14 | ||
diff --git a/recipes-graphics/xorg-driver/xf86-video-ast_1.1.5.bb b/recipes-graphics/xorg-driver/xf86-video-ast_1.1.6.bb index 090efd62..d7e4eab4 100644 --- a/recipes-graphics/xorg-driver/xf86-video-ast_1.1.5.bb +++ b/recipes-graphics/xorg-driver/xf86-video-ast_1.1.6.bb | |||
@@ -7,6 +7,6 @@ DESCRIPTION = "ast is an Xorg driver for ASpeed Technologies video cards" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=0b8c242f0218eea5caa949b7910a774b" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=0b8c242f0218eea5caa949b7910a774b" |
8 | 8 | ||
9 | DEPENDS += "libpciaccess" | 9 | DEPENDS += "libpciaccess" |
10 | XORG_DRIVER_COMPRESSOR = ".tar.gz" | ||
10 | 11 | ||
11 | SRC_URI[md5sum] = "4f85febe48d51e53624550a96fc9e9ee" | 12 | SRC_URI[sha256sum] = "eeff52178ce2916a0e07b531bb23c8b105826b6e6e6c5f7c90e33f757827a7c7" |
12 | SRC_URI[sha256sum] = "1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de" | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.17.1.bb b/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb index b7ac8ee4..7ef38650 100644 --- a/recipes-kernel/intel-ethernet/ixgbe_5.17.1.bb +++ b/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db56 | |||
10 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \ | 10 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "67bc730f7c47379342db8c4edb6980ceeb3715e48d366c1afe8e263cedd9f4ec" | 13 | SRC_URI[sha256sum] = "a844f1fea8064e30b276792455c3b286c1d7af26731e8f865d4a4e9ed1dcf4ab" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/" | 15 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/" |
16 | UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/" | 16 | UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/" |
@@ -19,7 +19,7 @@ CVE_PRODUCT = "linux:linux_kernel_ixgbe" | |||
19 | 19 | ||
20 | S = "${WORKDIR}/${BP}/src" | 20 | S = "${WORKDIR}/${BP}/src" |
21 | 21 | ||
22 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | 22 | EXTRA_OEMAKE=' KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' |
23 | 23 | ||
24 | KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbe" | 24 | KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbe" |
25 | KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbe" | 25 | KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbe" |
@@ -40,5 +40,4 @@ FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" | |||
40 | 40 | ||
41 | EXCLUDE_FROM_WORLD = "1" | 41 | EXCLUDE_FROM_WORLD = "1" |
42 | 42 | ||
43 | # This was fixed in kernel v4.4 | 43 | CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1" |
44 | CVE_CHECK_IGNORE += "CVE-2015-1142857" | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.16.5.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.18.7.bb index 0c6c1301..b21796c6 100644 --- a/recipes-kernel/intel-ethernet/ixgbevf_4.16.5.bb +++ b/recipes-kernel/intel-ethernet/ixgbevf_4.18.7.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db56 | |||
13 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ | 13 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "6c72bf8fb85c289c61e0f563540e07d5bcb19157b21786d25f974f08eefaa4df" | 16 | SRC_URI[sha256sum] = "90f6cd614008839b6fc748ae0f4ad3503435f8b788318d4f40cfc83c7029025e" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" | 18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" |
19 | UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" | 19 | UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" |
@@ -22,7 +22,7 @@ CVE_PRODUCT = "linux:linux_kernel_ixgbe" | |||
22 | 22 | ||
23 | S = "${WORKDIR}/${BP}/src" | 23 | S = "${WORKDIR}/${BP}/src" |
24 | 24 | ||
25 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | 25 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' |
26 | 26 | ||
27 | KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbevf" | 27 | KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbevf" |
28 | KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbevf" | 28 | KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbevf" |
@@ -41,7 +41,6 @@ PACKAGES += "${PN}-script" | |||
41 | 41 | ||
42 | FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" | 42 | FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" |
43 | 43 | ||
44 | # This was fixed in kernel v4.4 | 44 | CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1" |
45 | CVE_CHECK_IGNORE += "CVE-2015-1142857" | ||
46 | 45 | ||
47 | EXCLUDE_FROM_WORLD = "1" | 46 | EXCLUDE_FROM_WORLD = "1" |
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb index 7f2a9f5c..ea36cfc3 100644 --- a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb +++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb | |||
@@ -5,9 +5,9 @@ LICENSE = "GPL-2.0-only" | |||
5 | 5 | ||
6 | REQUIRED_DISTRO_FEATURES = "wifi" | 6 | REQUIRED_DISTRO_FEATURES = "wifi" |
7 | 7 | ||
8 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 8 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
9 | 9 | ||
10 | inherit module | 10 | inherit module features_check |
11 | 11 | ||
12 | # For some iwfwifi LinuxCore supported wireless chips, the best/latest | 12 | # For some iwfwifi LinuxCore supported wireless chips, the best/latest |
13 | # firmware blobs are found in the iwlwifi's linux-firmware.git fork. | 13 | # firmware blobs are found in the iwlwifi's linux-firmware.git fork. |
@@ -17,8 +17,8 @@ inherit module | |||
17 | # When updating this recipe, ensure that the proper firmware is included from | 17 | # When updating this recipe, ensure that the proper firmware is included from |
18 | # either the linux-firmware or iwlwifi-firmware repos. | 18 | # either the linux-firmware or iwlwifi-firmware repos. |
19 | 19 | ||
20 | PV = "45" | 20 | PV = "79" |
21 | SRCREV = "a75c1de6b3fa87885556c67619429cfa87cc048f" | 21 | SRCREV = "574631d89d736fd2c76b0e2ea489270c50903e52" |
22 | 22 | ||
23 | SRC_URI = " \ | 23 | SRC_URI = " \ |
24 | git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/core${PV} \ | 24 | git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/core${PV} \ |
@@ -44,6 +44,8 @@ do_install:append() { | |||
44 | 44 | ||
45 | RDEPENDS:${PN} = "linux-firmware-iwlwifi" | 45 | RDEPENDS:${PN} = "linux-firmware-iwlwifi" |
46 | 46 | ||
47 | FILES:${PN} += "${sysconfdir}/modprobe.d/iwlwifi.conf" | ||
48 | |||
47 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi" | 49 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi" |
48 | KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi" | 50 | KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi" |
49 | 51 | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_5.19.bb b/recipes-kernel/linux/linux-intel-rt_5.19.bb deleted file mode 100644 index 58952b0c..00000000 --- a/recipes-kernel/linux/linux-intel-rt_5.19.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | require linux-intel.inc | ||
2 | |||
3 | SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ | ||
4 | " | ||
5 | SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
6 | |||
7 | # Skip processing of this recipe if it is not explicitly specified as the | ||
8 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
9 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
10 | # core-image-rt-sdk, core-image-rt. | ||
11 | python () { | ||
12 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": | ||
13 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | ||
14 | } | ||
15 | |||
16 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
17 | |||
18 | KMETA_BRANCH = "yocto-5.19" | ||
19 | |||
20 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
21 | |||
22 | LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" | ||
23 | |||
24 | LINUX_VERSION ?= "5.19.0" | ||
25 | SRCREV_machine ?= "7de7f243440a51b6b996fc462f7fd7a546c175d2" | ||
26 | SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" | ||
27 | |||
28 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_5.15.bb b/recipes-kernel/linux/linux-intel-rt_6.6.bb index b6e0e3e4..342679eb 100644 --- a/recipes-kernel/linux/linux-intel-rt_5.15.bb +++ b/recipes-kernel/linux/linux-intel-rt_6.6.bb | |||
@@ -2,7 +2,6 @@ require linux-intel.inc | |||
2 | 2 | ||
3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
4 | " | 4 | " |
5 | SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
6 | 5 | ||
7 | # Skip processing of this recipe if it is not explicitly specified as the | 6 | # Skip processing of this recipe if it is not explicitly specified as the |
8 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | 7 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying |
@@ -13,23 +12,22 @@ python () { | |||
13 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | 12 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") |
14 | } | 13 | } |
15 | 14 | ||
16 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 15 | KBRANCH = "6.6/preempt-rt" |
16 | KMETA_BRANCH = "yocto-6.6" | ||
17 | 17 | ||
18 | KBRANCH = "5.15/preempt-rt" | 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
19 | KMETA_BRANCH = "yocto-5.15" | ||
20 | 19 | ||
21 | DEPENDS += "elfutils-native openssl-native util-linux-native" | 20 | DEPENDS += "elfutils-native openssl-native util-linux-native" |
22 | 21 | ||
23 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | 22 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" |
24 | 23 | ||
25 | LINUX_VERSION ?= "5.15.71" | 24 | LINUX_VERSION ?= "6.6.25" |
26 | SRCREV_machine ?= "e29405e36bfbda7ace776548de802b76f61b80d9" | 25 | SRCREV_machine ?= "f8939454cf9bb7277239bb44e90c99474c599f37" |
27 | SRCREV_meta ?= "50e12441b95837206d02d3ecfd17b1c562759d76" | 26 | SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a" |
28 | 27 | ||
29 | LINUX_KERNEL_TYPE = "preempt-rt" | 28 | LINUX_KERNEL_TYPE = "preempt-rt" |
30 | 29 | ||
31 | # We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel | 30 | # Functionality flags |
32 | # https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f | 31 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" |
33 | # It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c. | 32 | |
34 | # Suppress the harmless warning for now. | 33 | UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.6.(\d+)-rt(\d)-preempt-rt-(\d+)T(\d+)Z)$" |
35 | KCONF_BSP_AUDIT_LEVEL = "0" | ||
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index b54d634b..f78f5205 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc | |||
@@ -10,12 +10,14 @@ SRC_URI = " \ | |||
10 | file://0001-vt-conmakehash-improve-reproducibility.patch \ | 10 | file://0001-vt-conmakehash-improve-reproducibility.patch \ |
11 | file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ | 11 | file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ |
12 | file://fix-perf-reproducibility.patch \ | 12 | file://fix-perf-reproducibility.patch \ |
13 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | ||
14 | file://0002-mconf-fix-output-of-cflags-and-libraries.patch \ | ||
13 | " | 15 | " |
14 | 16 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 17 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 18 | ||
17 | KMETA = "kernel-meta" | 19 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 20 | KCONF_BSP_AUDIT_LEVEL = "0" |
19 | 21 | ||
20 | COMPATIBLE_MACHINE ?= "(intel-corei7-64)" | 22 | COMPATIBLE_MACHINE ?= "(intel-corei7-64)" |
21 | 23 | ||
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch index 3dc71ff2..a601e783 100644 --- a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001 | 1 | From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001 |
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> |
3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 | 3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 |
4 | Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location | 4 | Subject: [PATCH 1/2] menuconfig,mconf-cfg: Allow specification of ncurses |
5 | location | ||
5 | 6 | ||
6 | In some cross build environments such as the Yocto Project build | 7 | In some cross build environments such as the Yocto Project build |
7 | environment it provides an ncurses library that is compiled | 8 | environment it provides an ncurses library that is compiled |
@@ -16,33 +17,36 @@ check-lxdialog.sh for environments such as the Yocto Project. Adding | |||
16 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | 17 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing |
17 | compiling and linking against the right headers and libraries. | 18 | compiling and linking against the right headers and libraries. |
18 | 19 | ||
20 | Upstream-Status: Submitted | ||
21 | |||
19 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | 22 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> |
20 | cc: Michal Marek <mmarek@suse.cz> | 23 | cc: Michal Marek <mmarek@suse.cz> |
21 | cc: linux-kbuild@vger.kernel.org | 24 | cc: linux-kbuild@vger.kernel.org |
22 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 25 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
26 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
23 | --- | 27 | --- |
24 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ | 28 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ |
25 | 1 file changed, 8 insertions(+) | 29 | 1 file changed, 8 insertions(+) |
26 | 30 | ||
27 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | 31 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh |
28 | index c812872d7f9d..42d20819025c 100755 | 32 | index 1e61f50a5905..38cf8304bb31 100755 |
29 | --- a/scripts/kconfig/mconf-cfg.sh | 33 | --- a/scripts/kconfig/mconf-cfg.sh |
30 | +++ b/scripts/kconfig/mconf-cfg.sh | 34 | +++ b/scripts/kconfig/mconf-cfg.sh |
31 | @@ -4,6 +4,14 @@ | 35 | @@ -7,6 +7,14 @@ libs=$2 |
32 | PKG="ncursesw" | 36 | PKG="ncursesw" |
33 | PKG2="ncurses" | 37 | PKG2="ncurses" |
34 | 38 | ||
35 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | 39 | +if [ "$CROSS_CURSES_LIB" != "" ]; then |
36 | + echo libs=\'$CROSS_CURSES_LIB\' | 40 | + echo libs=\'$CROSS_CURSES_LIB\' |
37 | + if [ x"$CROSS_CURSES_INC" != x ]; then | 41 | + if [ x"$CROSS_CURSES_INC" != x ]; then |
38 | + echo cflags=\'$CROSS_CURSES_INC\' | 42 | + echo cflags=\'$CROSS_CURSES_INC\' |
39 | + fi | 43 | + fi |
40 | + exit 0 | 44 | + exit 0 |
41 | +fi | 45 | +fi |
42 | + | 46 | + |
43 | if [ -n "$(command -v pkg-config)" ]; then | 47 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then |
44 | if pkg-config --exists $PKG; then | 48 | if ${HOSTPKG_CONFIG} --exists $PKG; then |
45 | echo cflags=\"$(pkg-config --cflags $PKG)\" | 49 | ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} |
46 | -- | 50 | -- |
47 | 2.17.1 | 51 | 2.34.1 |
48 | 52 | ||
diff --git a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch deleted file mode 100644 index 0ebbb008..00000000 --- a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Fri, 12 Aug 2022 13:12:18 +0800 | ||
4 | Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location | ||
5 | |||
6 | In some cross build environments such as the Yocto Project build | ||
7 | environment it provides an ncurses library that is compiled | ||
8 | differently than the host's version. This causes display corruption | ||
9 | problems when the host's curses includes are used instead of the | ||
10 | includes from the provided compiler are overridden. There is a second | ||
11 | case where there is no curses libraries at all on the host system and | ||
12 | menuconfig will just fail entirely. | ||
13 | |||
14 | The solution is simply to allow an override variable in | ||
15 | check-lxdialog.sh for environments such as the Yocto Project. Adding | ||
16 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | ||
17 | compiling and linking against the right headers and libraries. | ||
18 | |||
19 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
20 | cc: Michal Marek <mmarek@suse.cz> | ||
21 | cc: linux-kbuild@vger.kernel.org | ||
22 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
23 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
24 | --- | ||
25 | scripts/kconfig/mconf-cfg.sh | 9 +++++++++ | ||
26 | 1 file changed, 9 insertions(+) | ||
27 | |||
28 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
29 | index 025b565e0b7c..6514d19790e6 100755 | ||
30 | --- a/scripts/kconfig/mconf-cfg.sh | ||
31 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
32 | @@ -4,6 +4,15 @@ | ||
33 | PKG="ncursesw" | ||
34 | PKG2="ncurses" | ||
35 | |||
36 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
37 | + echo libs=\'$CROSS_CURSES_LIB\' | ||
38 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
39 | + echo cflags=\'$CROSS_CURSES_INC\' | ||
40 | + fi | ||
41 | + exit 0 | ||
42 | +fi | ||
43 | + | ||
44 | + | ||
45 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then | ||
46 | if ${HOSTPKG_CONFIG} --exists $PKG; then | ||
47 | echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" | ||
48 | -- | ||
49 | 2.25.1 | ||
50 | |||
diff --git a/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch b/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch index 0a30ca40..33280063 100644 --- a/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch +++ b/recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch | |||
@@ -18,7 +18,7 @@ this solves the reprodicibility issue. | |||
18 | 18 | ||
19 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | 19 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
20 | 20 | ||
21 | Upstream-Status: Inappropriate | 21 | Upstream-Status: Inappropriate |
22 | 22 | ||
23 | Taken from linux-yocto, v5.15/standard/base | 23 | Taken from linux-yocto, v5.15/standard/base |
24 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 24 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
diff --git a/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch new file mode 100644 index 00000000..a96b68d9 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Mon, 17 Jul 2023 17:17:55 -0400 | ||
4 | Subject: [PATCH 2/2] mconf: fix output of cflags and libraries | ||
5 | |||
6 | commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce | ||
7 | process forks] changes the way that flags are detected. They are | ||
8 | no longer just echo'd and captured, they are written to a file and | ||
9 | later read. | ||
10 | |||
11 | We adjust our CROSS ncurses patch accordingly. | ||
12 | |||
13 | We'll eventually be able to drop this patch, but not quite yet. | ||
14 | |||
15 | Upstream-Status: Inappropriate [OE-Specific] | ||
16 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
17 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
18 | --- | ||
19 | scripts/kconfig/mconf-cfg.sh | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
23 | index 38cf8304bb31..a5ae56e08b07 100755 | ||
24 | --- a/scripts/kconfig/mconf-cfg.sh | ||
25 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
26 | @@ -8,9 +8,9 @@ PKG="ncursesw" | ||
27 | PKG2="ncurses" | ||
28 | |||
29 | if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
30 | - echo libs=\'$CROSS_CURSES_LIB\' | ||
31 | + echo $CROSS_CURSES_LIB > ${libs} | ||
32 | if [ x"$CROSS_CURSES_INC" != x ]; then | ||
33 | - echo cflags=\'$CROSS_CURSES_INC\' | ||
34 | + echo $CROSS_CURSES_INC > ${cflags} | ||
35 | fi | ||
36 | exit 0 | ||
37 | fi | ||
38 | -- | ||
39 | 2.34.1 | ||
40 | |||
diff --git a/recipes-kernel/linux/linux-intel_5.15.bb b/recipes-kernel/linux/linux-intel_5.15.bb deleted file mode 100644 index 644ae0d1..00000000 --- a/recipes-kernel/linux/linux-intel_5.15.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | require linux-intel.inc | ||
2 | |||
3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
4 | " | ||
5 | SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
6 | |||
7 | KBRANCH = "5.15/linux" | ||
8 | KMETA_BRANCH = "yocto-5.15" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
11 | |||
12 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
13 | |||
14 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
15 | |||
16 | LINUX_VERSION ?= "5.15.71" | ||
17 | SRCREV_machine ?= "7f0de68338ad7f625a7137278bf1d0a5edcbab45" | ||
18 | SRCREV_meta ?= "50e12441b95837206d02d3ecfd17b1c562759d76" | ||
19 | |||
20 | # Functionality flags | ||
21 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||
22 | |||
23 | # We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel | ||
24 | # https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f | ||
25 | # It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c. | ||
26 | # Suppress the harmless warning for now. | ||
27 | KCONF_BSP_AUDIT_LEVEL = "0" | ||
diff --git a/recipes-kernel/linux/linux-intel_6.6.bb b/recipes-kernel/linux/linux-intel_6.6.bb new file mode 100644 index 00000000..3b917bfa --- /dev/null +++ b/recipes-kernel/linux/linux-intel_6.6.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | require linux-intel.inc | ||
2 | |||
3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
4 | " | ||
5 | KBRANCH = "6.6/linux" | ||
6 | KMETA_BRANCH = "yocto-6.6" | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
9 | |||
10 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
11 | |||
12 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
13 | |||
14 | LINUX_VERSION ?= "6.6.25" | ||
15 | SRCREV_machine ?= "lts-v6.6.25-linux-240415T215440Z" | ||
16 | SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a" | ||
17 | |||
18 | # Functionality flags | ||
19 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||
20 | |||
21 | UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.6.(\d+)-linux-(\d+)T(\d+)Z)$" | ||
diff --git a/recipes-kernel/linux/linux-intel_5.19.bb b/recipes-kernel/linux/linux-intel_6.8.bb index 82d02fcd..036879db 100644 --- a/recipes-kernel/linux/linux-intel_5.19.bb +++ b/recipes-kernel/linux/linux-intel_6.8.bb | |||
@@ -1,10 +1,8 @@ | |||
1 | require linux-intel.inc | 1 | require linux-intel.inc |
2 | 2 | ||
3 | SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ | 3 | SRC_URI:prepend = "git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ |
4 | " | 4 | " |
5 | SRC_URI:append = " file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | 5 | KMETA_BRANCH = "master" |
6 | |||
7 | KMETA_BRANCH = "yocto-5.19" | ||
8 | 6 | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
10 | 8 | ||
@@ -12,9 +10,11 @@ DEPENDS += "elfutils-native openssl-native util-linux-native" | |||
12 | 10 | ||
13 | LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" | 11 | LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}" |
14 | 12 | ||
15 | LINUX_VERSION ?= "5.19.0" | 13 | LINUX_VERSION ?= "6.8" |
16 | SRCREV_machine ?= "20024f44f7ef62c5c4bd030a858e6b44ea2541ec" | 14 | SRCREV_machine ?= "efbae83db36abbbbdb946d4f7bbdfda174107cd2" |
17 | SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" | 15 | SRCREV_meta ?= "27907f391a4fc508da21358b13419c6e86926c34" |
18 | 16 | ||
19 | # Functionality flags | 17 | # Functionality flags |
20 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | 18 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" |
19 | |||
20 | UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.7-rc3-linux-(?P<pver>(\d+)T(\d+)Z)$" | ||
diff --git a/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend index daa7dd6b..daa7dd6b 100644 --- a/recipes-kernel/linux/linux-yocto-rt_5.%.bbappend +++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend | |||
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 7657b02f..9f3d43e3 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend | |||
@@ -1,3 +1,5 @@ | |||
1 | require meta-intel-compat-kernel.inc | ||
2 | |||
1 | # The kernel build is 64-bit regardless, so include both common overrides. | 3 | # The kernel build is 64-bit regardless, so include both common overrides. |
2 | # Without this, the kernel will be missing vars that make it buildable for the | 4 | # Without this, the kernel will be missing vars that make it buildable for the |
3 | # intel-corei7-64 machine. | 5 | # intel-corei7-64 machine. |
diff --git a/recipes-kernel/linux/linux-yocto_5.%.bbappend b/recipes-kernel/linux/linux-yocto_5.%.bbappend deleted file mode 100644 index daa7dd6b..00000000 --- a/recipes-kernel/linux/linux-yocto_5.%.bbappend +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | require meta-intel-compat-kernel.inc | ||
diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc index 41582aa5..0c861e13 100644 --- a/recipes-kernel/linux/meta-intel-compat-kernel.inc +++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc | |||
@@ -8,7 +8,7 @@ KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
8 | 8 | ||
9 | KMACHINE:corei7-64-intel-common = "intel-corei7-64" | 9 | KMACHINE:corei7-64-intel-common = "intel-corei7-64" |
10 | KMACHINE:core2-32-intel-common = "intel-core2-32" | 10 | KMACHINE:core2-32-intel-common = "intel-core2-32" |
11 | KMACHINE:skylake-64-intel-common = "intel-corei7-64" | 11 | KMACHINE:x86-64-v3-intel-common = "intel-corei7-64" |
12 | 12 | ||
13 | INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" | 13 | INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" |
14 | KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" | 14 | KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" |
diff --git a/recipes-multimedia/itt/itt_3.23.0.bb b/recipes-multimedia/itt/itt_3.24.6.bb index 83ff3142..1c4759f9 100644 --- a/recipes-multimedia/itt/itt_3.23.0.bb +++ b/recipes-multimedia/itt/itt_3.24.6.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c7 | |||
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master" |
12 | SRCREV = "96a01335dbc560b9224f52f0cc25c28ca0f1b564" | 12 | SRCREV = "ec077431fc725dba590b09b2cec5137878b14783" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | PE = "1" | 14 | PE = "1" |
15 | 15 | ||
diff --git a/recipes-multimedia/libva/files/0001-Disable-vp9-padding-on-mtl.patch b/recipes-multimedia/libva/files/0001-Disable-vp9-padding-on-mtl.patch new file mode 100644 index 00000000..90dff8d1 --- /dev/null +++ b/recipes-multimedia/libva/files/0001-Disable-vp9-padding-on-mtl.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 1b303f417113ad1aa6b63fc024fbe4aa0c943f57 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
3 | Date: Tue, 5 Sep 2023 16:13:42 +0800 | ||
4 | Subject: [PATCH 01/12] Disable vp9 padding on mtl. | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1720] | ||
7 | |||
8 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
9 | --- | ||
10 | media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp | ||
14 | index 844545a87..72265289c 100644 | ||
15 | --- a/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp | ||
16 | +++ b/media_softlet/linux/Xe_M_plus/ddi/media_sku_wa_mtl.cpp | ||
17 | @@ -284,7 +284,7 @@ static bool InitMtlMediaWaExt(struct GfxDeviceInfo *devInfo, | ||
18 | |||
19 | MEDIA_WR_WA(waTable, WaDisableSetObjectCapture, 1); | ||
20 | |||
21 | - MEDIA_WR_WA(waTable, Wa_Vp9UnalignedHeight, 1); | ||
22 | + MEDIA_WR_WA(waTable, Wa_Vp9UnalignedHeight, 0); | ||
23 | |||
24 | MEDIA_WR_WA(waTable, Wa_15013355402, 1); | ||
25 | |||
26 | @@ -337,4 +337,4 @@ static struct LinuxDeviceInit arlDeviceInit = | ||
27 | }; | ||
28 | |||
29 | static bool arlDeviceRegister = DeviceInfoFactory<LinuxDeviceInit>:: | ||
30 | - RegisterDevice((uint32_t)IGFX_ARROWLAKE, &arlDeviceInit); | ||
31 | \ No newline at end of file | ||
32 | + RegisterDevice((uint32_t)IGFX_ARROWLAKE, &arlDeviceInit); | ||
33 | -- | ||
34 | 2.40.1 | ||
35 | |||
diff --git a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch b/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch deleted file mode 100644 index 7fbf6d3a..00000000 --- a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 1b737d3711826757a16eed382eb5d436072e4945 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bernd Kuhls <bernd.kuhls@t-online.de> | ||
3 | Date: Fri, 10 Jun 2022 18:42:34 +0200 | ||
4 | Subject: [PATCH] Fix uClibc build | ||
5 | |||
6 | uClibc does not provide execinfo.h | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1437] | ||
9 | Signed-off-by: hilmanzafri <hilman.zafri.mazlan@intel.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 6 ++++++ | ||
12 | .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ | ||
13 | 2 files changed, 10 insertions(+) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 72b512087..db4ae54f8 100755 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) | ||
20 | |||
21 | option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) | ||
22 | |||
23 | +include(CheckIncludeFileCXX) | ||
24 | +check_include_file_cxx("execinfo.h" HAVE_EXECINFO) | ||
25 | +if (HAVE_EXECINFO) | ||
26 | + add_definitions(-DHAVE_EXECINFO) | ||
27 | +endif() | ||
28 | + | ||
29 | include(GNUInstallDirs) | ||
30 | |||
31 | if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX) | ||
32 | diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
33 | index 8b5d92da9..6d52e09ea 100644 | ||
34 | --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
35 | +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
36 | @@ -34,7 +34,9 @@ | ||
37 | #include <signal.h> | ||
38 | #include <unistd.h> // fork | ||
39 | #include <algorithm> | ||
40 | +#ifdef HAVE_EXECINFO | ||
41 | #include <execinfo.h> // backtrace | ||
42 | +#endif | ||
43 | #include <sys/types.h> | ||
44 | #include <sys/stat.h> // fstat | ||
45 | #include <sys/ipc.h> // System V IPC | ||
46 | @@ -2457,6 +2459,7 @@ void MosUtilities::MosTraceEvent( | ||
47 | MOS_FreeMemory(pTraceBuf); | ||
48 | } | ||
49 | } | ||
50 | +#ifdef HAVE_EXECINFO | ||
51 | if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) | ||
52 | { | ||
53 | // reserve space for header and stack size field. | ||
54 | @@ -2476,6 +2479,7 @@ void MosUtilities::MosTraceEvent( | ||
55 | size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); | ||
56 | } | ||
57 | } | ||
58 | +#endif | ||
59 | } | ||
60 | return; | ||
61 | } | ||
62 | -- | ||
63 | 2.34.1 | ||
64 | |||
diff --git a/recipes-multimedia/libva/files/0002-Force-ARGB-surface-to-tile4-for-ACM.patch b/recipes-multimedia/libva/files/0002-Force-ARGB-surface-to-tile4-for-ACM.patch new file mode 100644 index 00000000..df3d9805 --- /dev/null +++ b/recipes-multimedia/libva/files/0002-Force-ARGB-surface-to-tile4-for-ACM.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 1580f01ec5ad5afdad58c39dded999494275be10 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
3 | Date: Wed, 11 Oct 2023 15:36:21 +0800 | ||
4 | Subject: [PATCH 02/12] Force ARGB surface to tile4 for ACM | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1728] | ||
7 | |||
8 | Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com> | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | media_driver/linux/common/ddi/media_libva_util.cpp | 10 ++++++++++ | ||
12 | 1 file changed, 10 insertions(+) | ||
13 | |||
14 | diff --git a/media_driver/linux/common/ddi/media_libva_util.cpp b/media_driver/linux/common/ddi/media_libva_util.cpp | ||
15 | index 63c173419..73be76366 100755 | ||
16 | --- a/media_driver/linux/common/ddi/media_libva_util.cpp | ||
17 | +++ b/media_driver/linux/common/ddi/media_libva_util.cpp | ||
18 | @@ -504,6 +504,7 @@ VAStatus DdiMediaUtil_AllocateSurface( | ||
19 | gmmCustomParams.Flags.Gpu.UnifiedAuxSurface = 0; | ||
20 | } | ||
21 | } | ||
22 | + | ||
23 | break; | ||
24 | case TILING_X: | ||
25 | gmmCustomParams.Flags.Info.TiledX = true; | ||
26 | @@ -685,6 +686,15 @@ VAStatus DdiMediaUtil_AllocateSurface( | ||
27 | } | ||
28 | } | ||
29 | } | ||
30 | + // There's no VAAPI interface for modifier query yet. As a workaround, always allocate | ||
31 | + // RGB surface as tile4. | ||
32 | + if ((format == Media_Format_A8R8G8B8 || | ||
33 | + format == Media_Format_B10G10R10A2 | | ||
34 | + format == Media_Format_A8B8G8R8 || | ||
35 | + format == Media_Format_X8R8G8B8) && !MEDIA_IS_SKU(&mediaDrvCtx->SkuTable, FtrTileY)) | ||
36 | + { | ||
37 | + gmmParams.Flags.Info.Tile4 = true; | ||
38 | + } | ||
39 | break; | ||
40 | case TILING_X: | ||
41 | gmmParams.Flags.Info.TiledX = true; | ||
42 | -- | ||
43 | 2.40.1 | ||
44 | |||
diff --git a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch new file mode 100644 index 00000000..59fff127 --- /dev/null +++ b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From bb860c0bfe53060925b1dce50da4e6e94cfc8cae Mon Sep 17 00:00:00 2001 | ||
2 | From: huangli2018 <li.h.huang@intel.com> | ||
3 | Date: Wed, 20 Dec 2023 15:47:43 +0800 | ||
4 | Subject: [PATCH 04/13] Add device ID for ARL | ||
5 | |||
6 | Add device ID for ARL | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/95cbfce81cafa3c24d9d4601d41a855093bc51fb] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | 13 +++++++++++-- | ||
12 | 1 file changed, 11 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | ||
15 | index 426bd795f..7b73dfaff 100644 | ||
16 | --- a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | ||
17 | +++ b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp | ||
18 | @@ -1,6 +1,6 @@ | ||
19 | /*===================== begin_copyright_notice ================================== | ||
20 | |||
21 | -Copyright (c) 2022, Intel Corporation | ||
22 | +Copyright (c) 2023, Intel Corporation | ||
23 | |||
24 | Permission is hereby granted, free of charge, to any person obtaining a | ||
25 | copy of this software and associated documentation files (the "Software"), | ||
26 | @@ -218,4 +218,13 @@ static struct GfxDeviceInfo arlInfo = { | ||
27 | }; | ||
28 | |||
29 | static bool arlsDevice7d67 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
30 | - RegisterDevice(0x7D67, &arlInfo); | ||
31 | \ No newline at end of file | ||
32 | + RegisterDevice(0x7D67, &arlInfo); | ||
33 | + | ||
34 | +static bool arlhDevice7d51 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
35 | + RegisterDevice(0x7D51, &arlInfo); | ||
36 | + | ||
37 | +static bool arlhDevice7dd1 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
38 | + RegisterDevice(0x7DD1, &arlInfo); | ||
39 | + | ||
40 | +static bool arlhDevice7d41 = DeviceInfoFactory<GfxDeviceInfo>:: | ||
41 | + RegisterDevice(0x7D41, &arlInfo); | ||
42 | \ No newline at end of file | ||
43 | -- | ||
44 | 2.40.1 | ||
45 | |||
diff --git a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch new file mode 100644 index 00000000..a9cd2317 --- /dev/null +++ b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From bbd3af94a6146d702909ff7e25b0c0547ecbb895 Mon Sep 17 00:00:00 2001 | ||
2 | From: jlui <jonathan.ming.jun.lui@intel.com> | ||
3 | Date: Wed, 15 Nov 2023 10:48:34 +0800 | ||
4 | Subject: [PATCH 05/13] Add XR24 support to DMABuf | ||
5 | |||
6 | This is to enable XR24/BGRX support for DMABuf | ||
7 | |||
8 | Signed-off-by: Lui, Jonathan Ming Jun <jonathan.ming.jun.lui@intel.com> | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/3910b7029f5416fd0b5972f940c65d0a82c48c7b] | ||
11 | |||
12 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
13 | --- | ||
14 | .../vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | ||
18 | index fdcca8873..2dcf440a4 100644 | ||
19 | --- a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | ||
20 | +++ b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h | ||
21 | @@ -55,8 +55,9 @@ static ProfileSurfaceAttribInfo surfaceAttribInfo_VAEntrypointVideoProc_VAProfil | ||
22 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('4', '2', '2', 'V')}}}, | ||
23 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'A')}}}, | ||
24 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('B', 'G', 'R', 'A')}}}, | ||
25 | - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, { VA_FOURCC('R', 'G', 'B', 'P')}}}, | ||
26 | + {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'P')}}}, | ||
27 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'X')}}}, | ||
28 | + {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('X', 'R', 'G', 'B')}}}, | ||
29 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('P', '0', '1', '0')}}}, | ||
30 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', '2', '4')}}}, | ||
31 | {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ARGB}}}, | ||
32 | -- | ||
33 | 2.40.1 | ||
34 | |||
diff --git a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch new file mode 100644 index 00000000..5b04201a --- /dev/null +++ b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch | |||
@@ -0,0 +1,214 @@ | |||
1 | From 67fb6128adf8fc03d429393e98f0982b42a40e64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhang_Xinfeng <carl.zhang@intel.com> | ||
3 | Date: Wed, 27 Dec 2023 09:59:29 +0800 | ||
4 | Subject: [PATCH 06/12] add INTEL MEDIA ALLOC refineE to specify the memory | ||
5 | alignment | ||
6 | |||
7 | this key is used to allocate bigger pages | ||
8 | env variable INTEL_MEDIA_ALLOC_refineE also could be used | ||
9 | and was not enabled by default | ||
10 | mode 0 is default mode | ||
11 | mode 1 is < 64 align to 64 | ||
12 | mode 2 is > 1M && <= 3M align to 1M, >3M align to 2M | ||
13 | mode 3 is mode 1 & mode 2 | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/765dd939dcc5562d18cca18e5eda505bda952797] | ||
16 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
17 | --- | ||
18 | .../linux/common/os/i915/mos_bufmgr.c | 75 +++++++++++++++---- | ||
19 | .../common/os/i915_production/mos_bufmgr.c | 1 + | ||
20 | .../common/os/mos_context_specific_next.cpp | 21 +++++- | ||
21 | .../common/os/mos_user_setting_specific.cpp | 7 ++ | ||
22 | 4 files changed, 90 insertions(+), 14 deletions(-) | ||
23 | |||
24 | diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
25 | index c0b3ba027..b623d0129 100644 | ||
26 | --- a/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
27 | +++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
28 | @@ -138,7 +138,7 @@ struct mos_bufmgr_gem { | ||
29 | int exec_count; | ||
30 | |||
31 | /** Array of lists of cached gem objects of power-of-two sizes */ | ||
32 | - struct mos_gem_bo_bucket cache_bucket[14 * 4]; | ||
33 | + struct mos_gem_bo_bucket cache_bucket[64]; | ||
34 | int num_buckets; | ||
35 | time_t time; | ||
36 | |||
37 | @@ -3852,9 +3852,9 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size) | ||
38 | } | ||
39 | |||
40 | static void | ||
41 | -init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem) | ||
42 | +init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode) | ||
43 | { | ||
44 | - unsigned long size, cache_max_size = 64 * 1024 * 1024; | ||
45 | + unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size; | ||
46 | |||
47 | /* OK, so power of two buckets was too wasteful of memory. | ||
48 | * Give 3 other sizes between each power of two, to hopefully | ||
49 | @@ -3864,17 +3864,63 @@ init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem) | ||
50 | * width/height alignment and rounding of sizes to pages will | ||
51 | * get us useful cache hit rates anyway) | ||
52 | */ | ||
53 | - add_bucket(bufmgr_gem, 4096); | ||
54 | - add_bucket(bufmgr_gem, 4096 * 2); | ||
55 | - add_bucket(bufmgr_gem, 4096 * 3); | ||
56 | + /* alloc_mode 0 is default alloc_mode | ||
57 | + * alloc_mode 1 rounding up to 64K for all < 1M | ||
58 | + * alloc_mode 2 rounding up to 2M for size> 1M | ||
59 | + * alloc_mode 3 rounding up to 2M for size > 1M and 64K for size <= 1M */ | ||
60 | + if( alloc_mode > 3 ) | ||
61 | + alloc_mode = 0; | ||
62 | + | ||
63 | + if ( 0 == alloc_mode || 2 == alloc_mode) | ||
64 | + { | ||
65 | + // < 1M normal alloc_mode | ||
66 | + add_bucket(bufmgr_gem, 4096); | ||
67 | + add_bucket(bufmgr_gem, 4096 * 2); | ||
68 | + add_bucket(bufmgr_gem, 4096 * 3); | ||
69 | + /* Initialize the linked lists for BO reuse cache. */ | ||
70 | + for (size = 4 * 4096; size < 1024 * 1024; size *= 2) { | ||
71 | + add_bucket(bufmgr_gem, size); | ||
72 | + add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
73 | + add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
74 | + add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
75 | + } | ||
76 | |||
77 | - /* Initialize the linked lists for BO reuse cache. */ | ||
78 | - for (size = 4 * 4096; size <= cache_max_size; size *= 2) { | ||
79 | - add_bucket(bufmgr_gem, size); | ||
80 | + add_bucket(bufmgr_gem, 1024 * 1024); | ||
81 | + } | ||
82 | + if (1 == alloc_mode || 3 == alloc_mode) | ||
83 | + { | ||
84 | + // < 1M 64k alignment | ||
85 | + unit_size = 64 * 1024; | ||
86 | + for (size = unit_size; size <= 1024 * 1024; size += unit_size) | ||
87 | + { | ||
88 | + add_bucket(bufmgr_gem, size); | ||
89 | + } | ||
90 | + } | ||
91 | + if( 0 == alloc_mode || 1 == alloc_mode) | ||
92 | + { | ||
93 | + //> 1M is normal alloc_mode | ||
94 | + add_bucket(bufmgr_gem, 1280 * 1024); | ||
95 | + add_bucket(bufmgr_gem, 1536 * 1024); | ||
96 | + add_bucket(bufmgr_gem, 1792 * 1024); | ||
97 | + | ||
98 | + for (size = 2 * 1024 * 1024; size < cache_max_size; size *= 2) { | ||
99 | + add_bucket(bufmgr_gem, size); | ||
100 | + add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
101 | + add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
102 | + add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
103 | + } | ||
104 | + } | ||
105 | + if( 2 == alloc_mode || 3 == alloc_mode) | ||
106 | + { | ||
107 | + //> 1M rolling to 2M | ||
108 | + unit_size = 2 * 1024 * 1024; | ||
109 | + add_bucket(bufmgr_gem, unit_size); | ||
110 | + add_bucket(bufmgr_gem, 3 * 1024 * 1024); | ||
111 | |||
112 | - add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
113 | - add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
114 | - add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
115 | + for (size = 4 * 1024 * 1024; size <= cache_max_size; size += unit_size) | ||
116 | + { | ||
117 | + add_bucket(bufmgr_gem, size); | ||
118 | + } | ||
119 | } | ||
120 | } | ||
121 | |||
122 | @@ -5100,6 +5146,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
123 | struct drm_i915_gem_get_aperture aperture; | ||
124 | drm_i915_getparam_t gp; | ||
125 | int ret, tmp; | ||
126 | + uint8_t alloc_mode; | ||
127 | bool exec2 = false; | ||
128 | |||
129 | pthread_mutex_lock(&bufmgr_list_mutex); | ||
130 | @@ -5352,10 +5399,12 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
131 | * | ||
132 | * Every 4 was too few for the blender benchmark. | ||
133 | */ | ||
134 | + alloc_mode = (uint8_t)(batch_size & 0xff); | ||
135 | + batch_size &= 0xffffff00; | ||
136 | bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2; | ||
137 | |||
138 | DRMINITLISTHEAD(&bufmgr_gem->named); | ||
139 | - init_cache_buckets(bufmgr_gem); | ||
140 | + init_cache_buckets(bufmgr_gem,alloc_mode); | ||
141 | |||
142 | DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list); | ||
143 | |||
144 | diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c | ||
145 | index 90b5685b1..b3574f7d3 100644 | ||
146 | --- a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c | ||
147 | +++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c | ||
148 | @@ -5403,6 +5403,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
149 | * | ||
150 | * Every 4 was too few for the blender benchmark. | ||
151 | */ | ||
152 | + batch_size &= 0xffffff00; | ||
153 | bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2; | ||
154 | |||
155 | DRMINITLISTHEAD(&bufmgr_gem->named); | ||
156 | diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
157 | index 9e9e3ff7e..543e262d1 100644 | ||
158 | --- a/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
159 | +++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
160 | @@ -64,6 +64,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
161 | uint32_t iDeviceId = 0; | ||
162 | MOS_STATUS eStatus = MOS_STATUS_SUCCESS; | ||
163 | uint32_t value = 0; | ||
164 | + uint32_t mode = 0; | ||
165 | MediaUserSettingSharedPtr userSettingPtr = nullptr; | ||
166 | |||
167 | MOS_OS_FUNCTION_ENTER; | ||
168 | @@ -89,7 +90,25 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
169 | |||
170 | userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext); | ||
171 | |||
172 | - m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType); | ||
173 | + mode = BATCH_BUFFER_SIZE; | ||
174 | + ReadUserSetting( | ||
175 | + userSettingPtr, | ||
176 | + value, | ||
177 | + "INTEL MEDIA ALLOC MODE", | ||
178 | + MediaUserSetting::Group::Device); | ||
179 | + | ||
180 | + if (value) | ||
181 | + { | ||
182 | + mode |= (value & 0x000000ff); | ||
183 | + } | ||
184 | + value = 0; | ||
185 | + /* no need to set batch buffer size after switch to softpin | ||
186 | + * keep it, just for test during relocation to softpin transition | ||
187 | + * now , it could be a debug method , but is actually useless | ||
188 | + * so it is safe to reuse the lowest 8bit to convey addtional information | ||
189 | + * more suitable solution is deleting it , or add additional parameter*/ | ||
190 | + | ||
191 | + m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType); | ||
192 | if (nullptr == m_bufmgr) | ||
193 | { | ||
194 | MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd); | ||
195 | diff --git a/media_softlet/linux/common/os/mos_user_setting_specific.cpp b/media_softlet/linux/common/os/mos_user_setting_specific.cpp | ||
196 | index 6be8b4298..caed584f4 100644 | ||
197 | --- a/media_softlet/linux/common/os/mos_user_setting_specific.cpp | ||
198 | +++ b/media_softlet/linux/common/os/mos_user_setting_specific.cpp | ||
199 | @@ -52,5 +52,12 @@ MOS_STATUS MosUserSetting::InitMosUserSettingSpecific(MediaUserSettingSharedPtr | ||
200 | 0, | ||
201 | true); //"Enable VM Bind." | ||
202 | |||
203 | + DeclareUserSettingKey( | ||
204 | + userSettingPtr, | ||
205 | + "INTEL MEDIA ALLOC MODE", | ||
206 | + MediaUserSetting::Group::Device, | ||
207 | + 0, | ||
208 | + false); // | ||
209 | + | ||
210 | return MOS_STATUS_SUCCESS; | ||
211 | } | ||
212 | -- | ||
213 | 2.40.1 | ||
214 | |||
diff --git a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch new file mode 100644 index 00000000..459ff490 --- /dev/null +++ b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | From b1aebef4d342c77fc2b9c5efbf20aeb2aa9d634e Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang_Pingli <pingli.wang@intel.com> | ||
3 | Date: Thu, 28 Dec 2023 16:44:40 +0800 | ||
4 | Subject: [PATCH 07/12] Skip report keys | ||
5 | |||
6 | Skip to report keys | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/68ce25b0a6fa90614eb4734c8680aa4e149e8323] | ||
9 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../os/osservice/mos_utilities_specific.cpp | 30 +++++++++++++++++-- | ||
12 | 1 file changed, 28 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
15 | index b5df29f06..96785e21e 100644 | ||
16 | --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
17 | +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
18 | @@ -67,6 +67,8 @@ int32_t g_mosMemoryFailSimulateAllocCounter = 0; | ||
19 | int32_t *MosUtilities::m_mosAllocMemoryFailSimulateAllocCounter = &g_mosMemoryFailSimulateAllocCounter; | ||
20 | #endif | ||
21 | |||
22 | +static bool s_skipToReportReg = false; | ||
23 | + | ||
24 | double MosUtilities::MosGetTime() | ||
25 | { | ||
26 | struct timespec ts = {}; | ||
27 | @@ -1551,6 +1553,10 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) | ||
28 | { | ||
29 | std::string id = ""; | ||
30 | |||
31 | + static const char *disableReportRegKeyList[] = { | ||
32 | + "INTEL MEDIA ALLOC MODE" | ||
33 | + }; | ||
34 | + static const uint32_t disableReportRegKeyListCount = sizeof(disableReportRegKeyList) / sizeof(disableReportRegKeyList[0]); | ||
35 | while(!regStream.eof()) | ||
36 | { | ||
37 | std::string line = ""; | ||
38 | @@ -1585,8 +1591,22 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) | ||
39 | { | ||
40 | std::string name = line.substr(0,pos); | ||
41 | std::string value = line.substr(pos+1); | ||
42 | - auto &keys = regBufferMap[id]; | ||
43 | - keys[name] = value; | ||
44 | + if (name.size() > 0 && value.size() > 0) | ||
45 | + { | ||
46 | + auto &keys = regBufferMap[id]; | ||
47 | + keys[name] = value; | ||
48 | + if (s_skipToReportReg == false && id == USER_SETTING_CONFIG_PATH) | ||
49 | + { | ||
50 | + for (uint32_t i = 0; i < disableReportRegKeyListCount; i++) | ||
51 | + { | ||
52 | + if (strcmp(name.c_str(), disableReportRegKeyList[i]) == 0) | ||
53 | + { | ||
54 | + s_skipToReportReg = true; | ||
55 | + break; | ||
56 | + } | ||
57 | + } | ||
58 | + } | ||
59 | + } | ||
60 | } | ||
61 | } | ||
62 | } | ||
63 | @@ -1606,6 +1626,12 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) | ||
64 | MOS_STATUS MosUtilities::MosUninitializeReg(RegBufferMap ®BufferMap) | ||
65 | { | ||
66 | MOS_STATUS status = MOS_STATUS_SUCCESS; | ||
67 | + | ||
68 | + if (s_skipToReportReg) | ||
69 | + { | ||
70 | + return MOS_STATUS_SUCCESS; | ||
71 | + } | ||
72 | + | ||
73 | if (regBufferMap.size() == 0) | ||
74 | { | ||
75 | return MOS_STATUS_SUCCESS; | ||
76 | -- | ||
77 | 2.40.1 | ||
78 | |||
diff --git a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch new file mode 100644 index 00000000..ece5e00b --- /dev/null +++ b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch | |||
@@ -0,0 +1,255 @@ | |||
1 | From ac2ffac8d4aade216cc361c6c7120c13a8780719 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Soon, Thean Siew" <thean.siew.soon@intel.com> | ||
3 | Date: Thu, 28 Dec 2023 18:42:59 +0000 | ||
4 | Subject: [PATCH 08/12] Limit INTEL MEDIA ALLOC MODE to MTL and ARL only | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754] | ||
7 | |||
8 | Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com> | ||
9 | --- | ||
10 | .../common/os/i915/include/mos_bufmgr_api.h | 1 + | ||
11 | .../common/os/i915/include/mos_bufmgr_priv.h | 2 +- | ||
12 | .../linux/common/os/i915/mos_bufmgr.c | 69 +++++++++++++++---- | ||
13 | .../linux/common/os/i915/mos_bufmgr_api.c | 19 +++++ | ||
14 | .../os/i915_production/mos_bufmgr_priv.h | 1 + | ||
15 | .../common/os/mos_context_specific_next.cpp | 36 +++++----- | ||
16 | 6 files changed, 94 insertions(+), 34 deletions(-) | ||
17 | |||
18 | diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h | ||
19 | index 71cc01099..ab4f1ba89 100644 | ||
20 | --- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h | ||
21 | +++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h | ||
22 | @@ -299,6 +299,7 @@ void mos_bufmgr_enable_vmbind(struct mos_bufmgr *bufmgr); | ||
23 | void mos_bufmgr_disable_object_capture(struct mos_bufmgr *bufmgr); | ||
24 | int mos_bufmgr_get_memory_info(struct mos_bufmgr *bufmgr, char *info, uint32_t length); | ||
25 | int mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr); | ||
26 | +void mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode); | ||
27 | |||
28 | int mos_bo_map_unsynchronized(struct mos_linux_bo *bo); | ||
29 | int mos_bo_map_gtt(struct mos_linux_bo *bo); | ||
30 | diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h | ||
31 | index 63f69f985..6fd58f827 100644 | ||
32 | --- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h | ||
33 | +++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h | ||
34 | @@ -358,9 +358,9 @@ struct mos_bufmgr { | ||
35 | void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr; | ||
36 | int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr; | ||
37 | int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr; | ||
38 | + void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr; | ||
39 | int (*query_engines_count)(struct mos_bufmgr *bufmgr, | ||
40 | unsigned int *nengine) = nullptr; | ||
41 | - | ||
42 | int (*query_engines)(struct mos_bufmgr *bufmgr, | ||
43 | __u16 engine_class, | ||
44 | __u64 caps, | ||
45 | diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
46 | index b623d0129..2814ddbb7 100644 | ||
47 | --- a/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
48 | +++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c | ||
49 | @@ -2426,19 +2426,9 @@ mos_gem_bo_start_gtt_access(struct mos_linux_bo *bo, int write_enable) | ||
50 | } | ||
51 | |||
52 | static void | ||
53 | -mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr) | ||
54 | +mos_bufmgr_cleanup_cache(struct mos_bufmgr_gem *bufmgr_gem) | ||
55 | { | ||
56 | - struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *) bufmgr; | ||
57 | - struct drm_gem_close close_bo; | ||
58 | - int i, ret; | ||
59 | - | ||
60 | - free(bufmgr_gem->exec2_objects); | ||
61 | - free(bufmgr_gem->exec_objects); | ||
62 | - free(bufmgr_gem->exec_bos); | ||
63 | - pthread_mutex_destroy(&bufmgr_gem->lock); | ||
64 | - | ||
65 | - /* Free any cached buffer objects we were going to reuse */ | ||
66 | - for (i = 0; i < bufmgr_gem->num_buckets; i++) { | ||
67 | + for (int i = 0; i < bufmgr_gem->num_buckets; i++) { | ||
68 | struct mos_gem_bo_bucket *bucket = | ||
69 | &bufmgr_gem->cache_bucket[i]; | ||
70 | struct mos_bo_gem *bo_gem; | ||
71 | @@ -2450,7 +2440,25 @@ mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr) | ||
72 | |||
73 | mos_gem_bo_free(&bo_gem->bo); | ||
74 | } | ||
75 | + bufmgr_gem->cache_bucket[i].size = 0; | ||
76 | } | ||
77 | + bufmgr_gem->num_buckets = 0; | ||
78 | +} | ||
79 | + | ||
80 | +static void | ||
81 | +mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr) | ||
82 | +{ | ||
83 | + struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr; | ||
84 | + struct drm_gem_close close_bo; | ||
85 | + int ret; | ||
86 | + | ||
87 | + free(bufmgr_gem->exec2_objects); | ||
88 | + free(bufmgr_gem->exec_objects); | ||
89 | + free(bufmgr_gem->exec_bos); | ||
90 | + pthread_mutex_destroy(&bufmgr_gem->lock); | ||
91 | + | ||
92 | + /* Free any cached buffer objects we were going to reuse */ | ||
93 | + mos_bufmgr_cleanup_cache(bufmgr_gem); | ||
94 | |||
95 | /* Release userptr bo kept hanging around for optimisation. */ | ||
96 | if (bufmgr_gem->userptr_active.ptr) { | ||
97 | @@ -3852,9 +3860,41 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size) | ||
98 | } | ||
99 | |||
100 | static void | ||
101 | -init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode) | ||
102 | +init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem) | ||
103 | +{ | ||
104 | + unsigned long size, cache_max_size = 64 * 1024 * 1024; | ||
105 | + | ||
106 | + /* OK, so power of two buckets was too wasteful of memory. | ||
107 | + * Give 3 other sizes between each power of two, to hopefully | ||
108 | + * cover things accurately enough. (The alternative is | ||
109 | + * probably to just go for exact matching of sizes, and assume | ||
110 | + * that for things like composited window resize the tiled | ||
111 | + * width/height alignment and rounding of sizes to pages will | ||
112 | + * get us useful cache hit rates anyway) | ||
113 | + */ | ||
114 | + add_bucket(bufmgr_gem, 4096); | ||
115 | + add_bucket(bufmgr_gem, 4096 * 2); | ||
116 | + add_bucket(bufmgr_gem, 4096 * 3); | ||
117 | + | ||
118 | + /* Initialize the linked lists for BO reuse cache. */ | ||
119 | + for (size = 4 * 4096; size <= cache_max_size; size *= 2) { | ||
120 | + add_bucket(bufmgr_gem, size); | ||
121 | + | ||
122 | + add_bucket(bufmgr_gem, size + size * 1 / 4); | ||
123 | + add_bucket(bufmgr_gem, size + size * 2 / 4); | ||
124 | + add_bucket(bufmgr_gem, size + size * 3 / 4); | ||
125 | + } | ||
126 | +} | ||
127 | + | ||
128 | +static void | ||
129 | +mos_gem_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) | ||
130 | { | ||
131 | unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size; | ||
132 | + struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr; | ||
133 | + | ||
134 | + // Clean up the pre-allocated cache before re-allocating according | ||
135 | + // to alloc_mode | ||
136 | + mos_bufmgr_cleanup_cache(bufmgr_gem); | ||
137 | |||
138 | /* OK, so power of two buckets was too wasteful of memory. | ||
139 | * Give 3 other sizes between each power of two, to hopefully | ||
140 | @@ -5218,6 +5258,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
141 | bufmgr_gem->bufmgr.disable_object_capture = mos_gem_disable_object_capture; | ||
142 | bufmgr_gem->bufmgr.get_memory_info = mos_gem_get_memory_info; | ||
143 | bufmgr_gem->bufmgr.get_devid = mos_gem_get_devid; | ||
144 | + bufmgr_gem->bufmgr.realloc_cache = mos_gem_realloc_cache; | ||
145 | bufmgr_gem->bufmgr.set_context_param = mos_gem_set_context_param; | ||
146 | bufmgr_gem->bufmgr.set_context_param_parallel = mos_gem_set_context_param_parallel; | ||
147 | bufmgr_gem->bufmgr.set_context_param_load_balance = mos_gem_set_context_param_load_balance; | ||
148 | @@ -5404,7 +5445,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size) | ||
149 | bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2; | ||
150 | |||
151 | DRMINITLISTHEAD(&bufmgr_gem->named); | ||
152 | - init_cache_buckets(bufmgr_gem,alloc_mode); | ||
153 | + init_cache_buckets(bufmgr_gem); | ||
154 | |||
155 | DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list); | ||
156 | |||
157 | diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c | ||
158 | index abe8ef96a..d0e02c267 100644 | ||
159 | --- a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c | ||
160 | +++ b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c | ||
161 | @@ -1204,6 +1204,25 @@ mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr) | ||
162 | } | ||
163 | } | ||
164 | |||
165 | +void | ||
166 | +mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) | ||
167 | +{ | ||
168 | + if(!bufmgr) | ||
169 | + { | ||
170 | + MOS_OS_CRITICALMESSAGE("Input null ptr\n"); | ||
171 | + return; | ||
172 | + } | ||
173 | + | ||
174 | + if (bufmgr->realloc_cache) | ||
175 | + { | ||
176 | + return bufmgr->realloc_cache(bufmgr, alloc_mode); | ||
177 | + } | ||
178 | + else | ||
179 | + { | ||
180 | + MOS_OS_CRITICALMESSAGE("Unsupported\n"); | ||
181 | + } | ||
182 | +} | ||
183 | + | ||
184 | int | ||
185 | mos_query_engines_count(struct mos_bufmgr *bufmgr, | ||
186 | unsigned int *nengine) | ||
187 | diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h | ||
188 | index c3b765a4c..1d7f7edb0 100644 | ||
189 | --- a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h | ||
190 | +++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h | ||
191 | @@ -358,6 +358,7 @@ struct mos_bufmgr { | ||
192 | void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr; | ||
193 | int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr; | ||
194 | int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr; | ||
195 | + void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr; | ||
196 | int (*query_engines_count)(struct mos_bufmgr *bufmgr, | ||
197 | unsigned int *nengine) = nullptr; | ||
198 | |||
199 | diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
200 | index 543e262d1..87059f538 100644 | ||
201 | --- a/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
202 | +++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
203 | @@ -90,25 +90,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
204 | |||
205 | userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext); | ||
206 | |||
207 | - mode = BATCH_BUFFER_SIZE; | ||
208 | - ReadUserSetting( | ||
209 | - userSettingPtr, | ||
210 | - value, | ||
211 | - "INTEL MEDIA ALLOC MODE", | ||
212 | - MediaUserSetting::Group::Device); | ||
213 | - | ||
214 | - if (value) | ||
215 | - { | ||
216 | - mode |= (value & 0x000000ff); | ||
217 | - } | ||
218 | - value = 0; | ||
219 | - /* no need to set batch buffer size after switch to softpin | ||
220 | - * keep it, just for test during relocation to softpin transition | ||
221 | - * now , it could be a debug method , but is actually useless | ||
222 | - * so it is safe to reuse the lowest 8bit to convey addtional information | ||
223 | - * more suitable solution is deleting it , or add additional parameter*/ | ||
224 | - | ||
225 | - m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType); | ||
226 | + m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType); | ||
227 | if (nullptr == m_bufmgr) | ||
228 | { | ||
229 | MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd); | ||
230 | @@ -151,6 +133,22 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
231 | return eStatus; | ||
232 | } | ||
233 | |||
234 | + if (m_platformInfo.eProductFamily == IGFX_METEORLAKE || | ||
235 | + m_platformInfo.eProductFamily == IGFX_ARROWLAKE) | ||
236 | + { | ||
237 | + ReadUserSetting( | ||
238 | + userSettingPtr, | ||
239 | + value, | ||
240 | + "INTEL MEDIA ALLOC MODE", | ||
241 | + MediaUserSetting::Group::Device); | ||
242 | + | ||
243 | + if (value) | ||
244 | + { | ||
245 | + mode = (value & 0x000000ff); | ||
246 | + } | ||
247 | + mos_bufmgr_realloc_cache(m_bufmgr, mode); | ||
248 | + } | ||
249 | + | ||
250 | ReadUserSetting( | ||
251 | userSettingPtr, | ||
252 | value, | ||
253 | -- | ||
254 | 2.40.1 | ||
255 | |||
diff --git a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch new file mode 100644 index 00000000..8ee7ef14 --- /dev/null +++ b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 18c32247cbc0e9fabff7a847add099496af9e53f Mon Sep 17 00:00:00 2001 | ||
2 | From: "Soon, Thean Siew" <thean.siew.soon@intel.com> | ||
3 | Date: Mon, 8 Jan 2024 18:12:30 +0000 | ||
4 | Subject: [PATCH 09/12] Skip cache bucket realloc for default mode 0 | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754] | ||
7 | |||
8 | Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com> | ||
9 | --- | ||
10 | .../linux/common/os/mos_context_specific_next.cpp | 7 ++++++- | ||
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
14 | index 87059f538..9dbd5da79 100644 | ||
15 | --- a/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
16 | +++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp | ||
17 | @@ -146,7 +146,12 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext) | ||
18 | { | ||
19 | mode = (value & 0x000000ff); | ||
20 | } | ||
21 | - mos_bufmgr_realloc_cache(m_bufmgr, mode); | ||
22 | + | ||
23 | + // Realloc cache only if it's not mode 0 | ||
24 | + if (mode) | ||
25 | + { | ||
26 | + mos_bufmgr_realloc_cache(m_bufmgr, mode); | ||
27 | + } | ||
28 | } | ||
29 | |||
30 | ReadUserSetting( | ||
31 | -- | ||
32 | 2.40.1 | ||
33 | |||
diff --git a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch new file mode 100644 index 00000000..0100df77 --- /dev/null +++ b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch | |||
@@ -0,0 +1,195 @@ | |||
1 | From 7291ab5206c5e172c6c94dcfbe4f1bc258f3b7a5 Mon Sep 17 00:00:00 2001 | ||
2 | From: WenshengZhang <wensheng.zhang@intel.com> | ||
3 | Date: Wed, 10 Jan 2024 14:08:37 +0800 | ||
4 | Subject: [PATCH 10/12] Fix failed 4k video wall test case and color corruption | ||
5 | of video composition | ||
6 | |||
7 | Fix failed 4k video wall test case from 16CH video only show 1CH output and | ||
8 | corruption observed on certain number of video composition when doing | ||
9 | sample_multi_transcode. | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/38e14b1b97170b51586d00d1fa607e496b0c5825] | ||
12 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
13 | --- | ||
14 | .../common/vp/kdll/hal_kerneldll_next.h | 1 + | ||
15 | .../vp/hal/packet/vp_render_fc_kernel.cpp | 7 ++ | ||
16 | .../common/vp/kdll/hal_kerneldll_next.c | 70 +++++++++++-------- | ||
17 | .../linux/common/vp/ddi/ddi_vp_functions.cpp | 20 ++---- | ||
18 | 4 files changed, 55 insertions(+), 43 deletions(-) | ||
19 | |||
20 | diff --git a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h | ||
21 | index 6447999b7..8e2ab371e 100644 | ||
22 | --- a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h | ||
23 | +++ b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h | ||
24 | @@ -588,6 +588,7 @@ typedef struct tagKdll_FilterEntry | ||
25 | Kdll_Scalingratio ScalingRatio; | ||
26 | Kdll_RenderMethod RenderMethod; | ||
27 | Kdll_SetCSCCoeffMethod SetCSCCoeffMode; | ||
28 | + bool forceToTargetColorSpace; | ||
29 | } Kdll_FilterEntry, *PKdll_FilterEntry; | ||
30 | |||
31 | // Structure that defines a compositing filter | ||
32 | diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp | ||
33 | index 8e982f67e..f8308fed1 100644 | ||
34 | --- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp | ||
35 | +++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp | ||
36 | @@ -775,6 +775,13 @@ MOS_STATUS VpRenderFcKernel::BuildFilter( | ||
37 | |||
38 | for (i = 0; (i < (int)compParams->sourceCount) && (iMaxFilterSize > 0); i++) | ||
39 | { | ||
40 | + if (i > 0) | ||
41 | + { | ||
42 | + if (!RECT1_CONTAINS_RECT2(compParams->source[0].surf->rcDst, compParams->source[i].surf->rcDst)) | ||
43 | + { | ||
44 | + pFilter->forceToTargetColorSpace = true; | ||
45 | + } | ||
46 | + } | ||
47 | src = &compParams->source[i]; | ||
48 | |||
49 | //-------------------------------- | ||
50 | diff --git a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c | ||
51 | index d8f7d429a..151f3b039 100644 | ||
52 | --- a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c | ||
53 | +++ b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c | ||
54 | @@ -2378,6 +2378,7 @@ bool KernelDll_SetupCSC( | ||
55 | Kdll_CSC_Matrix curr_matrix; | ||
56 | Kdll_CSC_Matrix *matrix = pCSC->Matrix; // Color Space conversion matrix | ||
57 | uint8_t * matrixID = pCSC->MatrixID; // CSC coefficient allocation table | ||
58 | + bool forceToTargetColorSpace = false; | ||
59 | |||
60 | // Clear all CSC matrices | ||
61 | MOS_ZeroMemory(matrix, sizeof(pCSC->Matrix)); | ||
62 | @@ -2395,6 +2396,10 @@ bool KernelDll_SetupCSC( | ||
63 | //---------------------------------------------------------------// | ||
64 | for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++) | ||
65 | { | ||
66 | + if (pFilter->forceToTargetColorSpace) | ||
67 | + { | ||
68 | + forceToTargetColorSpace = true; | ||
69 | + } | ||
70 | // Disable Procamp for all layers except Main Video | ||
71 | // Disable Procamp if source is RGB | ||
72 | if (pFilter->layer != Layer_MainVideo || | ||
73 | @@ -2456,44 +2461,51 @@ bool KernelDll_SetupCSC( | ||
74 | //---------------------------------------------------------------// | ||
75 | if (sel_cspace == CSpace_Any) | ||
76 | { | ||
77 | - int cs; | ||
78 | - for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++) | ||
79 | + if (forceToTargetColorSpace) | ||
80 | { | ||
81 | - // Skip color spaces not in use | ||
82 | - cspace = (VPHAL_CSPACE)cs; | ||
83 | - if (!cspace_in_use[cspace]) | ||
84 | - { | ||
85 | - continue; | ||
86 | - } | ||
87 | - | ||
88 | - // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I) | ||
89 | - cspace = KernelDll_TranslateCspace(cspace); | ||
90 | - | ||
91 | - // Count # of CS conversions and matrices | ||
92 | - csc_count = 0; | ||
93 | - for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++) | ||
94 | + sel_cspace = out_cspace; | ||
95 | + } | ||
96 | + else | ||
97 | + { | ||
98 | + int cs; | ||
99 | + for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++) | ||
100 | { | ||
101 | - // Ignore layers where the Color Space may be set in software (colorfill, palletized) | ||
102 | - if (pFilter->cspace == CSpace_Any) | ||
103 | + // Skip color spaces not in use | ||
104 | + cspace = (VPHAL_CSPACE)cs; | ||
105 | + if (!cspace_in_use[cspace]) | ||
106 | { | ||
107 | continue; | ||
108 | } | ||
109 | |||
110 | - // Check if CSC/PA is required | ||
111 | - if (KernelDll_TranslateCspace(pFilter->cspace) != cspace || | ||
112 | - pFilter->procamp != DL_PROCAMP_DISABLED) | ||
113 | + // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I) | ||
114 | + cspace = KernelDll_TranslateCspace(cspace); | ||
115 | + | ||
116 | + // Count # of CS conversions and matrices | ||
117 | + csc_count = 0; | ||
118 | + for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++) | ||
119 | { | ||
120 | - csc_count++; | ||
121 | + // Ignore layers where the Color Space may be set in software (colorfill, palletized) | ||
122 | + if (pFilter->cspace == CSpace_Any) | ||
123 | + { | ||
124 | + continue; | ||
125 | + } | ||
126 | + | ||
127 | + // Check if CSC/PA is required | ||
128 | + if (KernelDll_TranslateCspace(pFilter->cspace) != cspace || | ||
129 | + pFilter->procamp != DL_PROCAMP_DISABLED) | ||
130 | + { | ||
131 | + csc_count++; | ||
132 | + } | ||
133 | } | ||
134 | - } | ||
135 | |||
136 | - // Save best choice as requiring minimum number of CSC operations | ||
137 | - if ((sel_csc_count < 0) || // Initial value | ||
138 | - (csc_count < sel_csc_count) || // Minimum number of CSC operations | ||
139 | - (csc_count == sel_csc_count && cs == main_cspace)) // Use main cspace as default if same CSC count | ||
140 | - { | ||
141 | - sel_cspace = cspace; | ||
142 | - sel_csc_count = csc_count; | ||
143 | + // Save best choice as requiring minimum number of CSC operations | ||
144 | + if ((sel_csc_count < 0) || // Initial value | ||
145 | + (csc_count < sel_csc_count) || // Minimum number of CSC operations | ||
146 | + (csc_count == sel_csc_count && cs == main_cspace)) // Use main cspace as default if same CSC count | ||
147 | + { | ||
148 | + sel_cspace = cspace; | ||
149 | + sel_csc_count = csc_count; | ||
150 | + } | ||
151 | } | ||
152 | } | ||
153 | } | ||
154 | diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
155 | index 40d0b3fad..e60a6c69c 100644 | ||
156 | --- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
157 | +++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
158 | @@ -2115,9 +2115,8 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill( | ||
159 | { | ||
160 | DDI_VP_FUNC_ENTER; | ||
161 | DDI_VP_CHK_NULL(vpHalRenderParams, "nullptr vpHalRenderParams.", VA_STATUS_ERROR_INVALID_PARAMETER); | ||
162 | - DDI_VP_CHK_NULL(vpHalRenderParams->pTarget[0],"nullptr pTarget[0].", VA_STATUS_ERROR_INVALID_PARAMETER); | ||
163 | |||
164 | - if ((outBackGroundcolor >> 24) != 0 || vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB) | ||
165 | + if ((outBackGroundcolor >> 24) != 0) | ||
166 | { | ||
167 | if (vpHalRenderParams->pColorFillParams == nullptr) | ||
168 | { | ||
169 | @@ -2126,18 +2125,11 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill( | ||
170 | |||
171 | DDI_VP_CHK_NULL(vpHalRenderParams->pColorFillParams, "nullptr pColorFillParams.", VA_STATUS_ERROR_UNKNOWN); | ||
172 | |||
173 | - if (vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB && (outBackGroundcolor >> 24) == 0) | ||
174 | - { | ||
175 | - // set color space for sRGB output | ||
176 | - vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
177 | - } | ||
178 | - else | ||
179 | - { | ||
180 | - // set background colorfill option | ||
181 | - vpHalRenderParams->pColorFillParams->Color = outBackGroundcolor; | ||
182 | - vpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
183 | - vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
184 | - } | ||
185 | + // set background colorfill option | ||
186 | + vpHalRenderParams->pColorFillParams->Color = outBackGroundcolor; | ||
187 | + vpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
188 | + vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
189 | + | ||
190 | } | ||
191 | else | ||
192 | { | ||
193 | -- | ||
194 | 2.40.1 | ||
195 | |||
diff --git a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch new file mode 100644 index 00000000..2f4aec1e --- /dev/null +++ b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From f8b4d982232d4c1330e1e5f5dcd7cd8ca94decba Mon Sep 17 00:00:00 2001 | ||
2 | From: WenshengZhang <wensheng.zhang@intel.com> | ||
3 | Date: Thu, 25 Jan 2024 16:35:10 +0800 | ||
4 | Subject: [PATCH 11/12] Disable 422H format output | ||
5 | |||
6 | Disable 422H format output. | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/eab411768e61a46e096793291f5f992eecf76cd8] | ||
9 | Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../agnostic/common/vp/hal/feature_manager/policy.cpp | 6 ++++++ | ||
12 | 1 file changed, 6 insertions(+) | ||
13 | |||
14 | diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp | ||
15 | index 317cec25a..12f1124fa 100644 | ||
16 | --- a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp | ||
17 | +++ b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp | ||
18 | @@ -1140,6 +1140,12 @@ MOS_STATUS Policy::GetScalingExecutionCaps(SwFilter *feature, bool isHdrEnabled) | ||
19 | bool isAlphaSettingSupportedByVebox = | ||
20 | IsAlphaSettingSupportedByVebox(scalingParams->formatInput, scalingParams->formatOutput, scalingParams->pCompAlpha); | ||
21 | |||
22 | + if (scalingParams->formatOutput == Format_422H) | ||
23 | + { | ||
24 | + VP_PUBLIC_ASSERTMESSAGE("Scaling not support 422H format output."); | ||
25 | + return MOS_STATUS_UNIMPLEMENTED; | ||
26 | + } | ||
27 | + | ||
28 | // Clean usedForNextPass flag. | ||
29 | if (scalingEngine->usedForNextPass) | ||
30 | { | ||
31 | -- | ||
32 | 2.40.1 | ||
33 | |||
diff --git a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch new file mode 100644 index 00000000..1be9139d --- /dev/null +++ b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From b93904533d3ee66c7919fa8e23d26b852a37a917 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
3 | Date: Tue, 30 Jan 2024 13:27:52 +0800 | ||
4 | Subject: [PATCH 12/12] [Decode] Fix AVC decode SFC 4K hang issue | ||
5 | |||
6 | Updated VDSFC input width and height for AVC decode | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/intel-innersource/drivers.gpu.unified/pull/151401] | ||
9 | |||
10 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
11 | --- | ||
12 | .../hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | 4 ++++ | ||
13 | 1 file changed, 4 insertions(+) | ||
14 | |||
15 | diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | ||
16 | index e75fd8137..9cc236bd7 100644 | ||
17 | --- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | ||
18 | +++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp | ||
19 | @@ -59,6 +59,10 @@ MOS_STATUS AvcDownSamplingPkt::InitSfcParams(VDBOX_SFC_PARAMS &sfcParams) | ||
20 | |||
21 | AvcBasicFeature *avcBasicFeature = dynamic_cast<AvcBasicFeature*>(m_basicFeature); | ||
22 | DECODE_CHK_NULL(avcBasicFeature); | ||
23 | + | ||
24 | + sfcParams.input.width = avcBasicFeature->m_width; | ||
25 | + sfcParams.input.height = avcBasicFeature->m_height; | ||
26 | + | ||
27 | CODEC_PICTURE curPic = avcBasicFeature->m_avcPicParams->CurrPic; | ||
28 | |||
29 | if (avcBasicFeature->m_avcPicParams->seq_fields.mb_adaptive_frame_field_flag == true) | ||
30 | -- | ||
31 | 2.40.1 | ||
32 | |||
diff --git a/recipes-multimedia/libva/intel-media-driver_22.5.4.bb b/recipes-multimedia/libva/intel-media-driver_23.4.3.bb index c838154a..6513d574 100644 --- a/recipes-multimedia/libva/intel-media-driver_22.5.4.bb +++ b/recipes-multimedia/libva/intel-media-driver_23.4.3.bb | |||
@@ -19,10 +19,20 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
19 | DEPENDS += "libva gmmlib" | 19 | DEPENDS += "libva gmmlib" |
20 | 20 | ||
21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ | 21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ |
22 | file://0001-Fix-uClibc-build.patch \ | 22 | file://0001-Disable-vp9-padding-on-mtl.patch \ |
23 | file://0002-Force-ARGB-surface-to-tile4-for-ACM.patch \ | ||
24 | file://0004-Add-device-ID-for-ARL.patch \ | ||
25 | file://0005-Add-XR24-support-to-DMABuf.patch \ | ||
26 | file://0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch \ | ||
27 | file://0007-Skip-report-keys.patch \ | ||
28 | file://0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch \ | ||
29 | file://0009-Skip-cache-bucket-realloc-for-default-mode-0.patch \ | ||
30 | file://0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch \ | ||
31 | file://0011-Disable-422H-format-output.patch \ | ||
32 | file://0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch \ | ||
23 | " | 33 | " |
24 | 34 | ||
25 | SRCREV = "e461c0558c87a327c5a133efbcb5295e85c7d7f5" | 35 | SRCREV = "a9f272496fc0f3e823cc4a814666ea27b443d902" |
26 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |
27 | 37 | ||
28 | COMPATIBLE_HOST:x86-x32 = "null" | 38 | COMPATIBLE_HOST:x86-x32 = "null" |
diff --git a/recipes-multimedia/mediasdk/files/fix-gcc13.patch b/recipes-multimedia/mediasdk/files/fix-gcc13.patch new file mode 100644 index 00000000..fb973870 --- /dev/null +++ b/recipes-multimedia/mediasdk/files/fix-gcc13.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Inactive-Upstream | ||
2 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | |||
4 | diff --git a/api/mfx_dispatch/linux/mfxparser.cpp b/api/mfx_dispatch/linux/mfxparser.cpp | ||
5 | index 9d3823ec3e..12e46d1881 100644 | ||
6 | --- a/api/mfx_dispatch/linux/mfxparser.cpp | ||
7 | +++ b/api/mfx_dispatch/linux/mfxparser.cpp | ||
8 | @@ -20,6 +20,7 @@ | ||
9 | |||
10 | #include <ctype.h> | ||
11 | #include <stdio.h> | ||
12 | +#include <stdint.h> | ||
13 | #include <stdlib.h> | ||
14 | #include <string.h> | ||
15 | |||
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_22.6.0.bb b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb index 9e2f9c57..f00a4404 100644 --- a/recipes-multimedia/mediasdk/intel-mediasdk_22.6.0.bb +++ b/recipes-multimedia/mediasdk/intel-mediasdk_23.2.2.bb | |||
@@ -29,15 +29,16 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dri3", "", d) | |||
29 | 29 | ||
30 | PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" | 30 | PACKAGECONFIG[dri3] = "-DENABLE_X11_DRI3=ON, -DENABLE_X11_DRI3=OFF" |
31 | PACKAGECONFIG[itt] = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt" | 31 | PACKAGECONFIG[itt] = "-DENABLE_ITT=ON, -DENABLE_ITT=OFF, itt" |
32 | PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, ocl-icd opencl-clhpp opencl-headers" | 32 | PACKAGECONFIG[opencl] = "-DENABLE_OPENCL=ON, -DENABLE_OPENCL=OFF, virtual/opencl-icd opencl-clhpp opencl-headers" |
33 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" | 33 | PACKAGECONFIG[samples] = "-DBUILD_SAMPLES=ON, -DBUILD_SAMPLES=OFF" |
34 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" | 34 | PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND=ON, -DENABLE_WAYLAND=OFF, wayland wayland-native" |
35 | 35 | ||
36 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \ | 36 | SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch=1;lfs=0 \ |
37 | file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ | 37 | file://0001-FindITT.cmake-fix-detection-of-header-library.patch \ |
38 | file://fix-gcc13.patch \ | ||
38 | " | 39 | " |
39 | 40 | ||
40 | SRCREV = "db69ddd7d408fbf26e53a766aaaf3b091d65d2e7" | 41 | SRCREV = "869b60a6c3d7b5e9f7c3b3b914986322dca4bbae" |
41 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
42 | 43 | ||
43 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" | 44 | UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$" |
diff --git a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch new file mode 100644 index 00000000..8d1f3380 --- /dev/null +++ b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a425927469b36e7bc597bff4fdc24d42a1168d1a Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Mon, 18 Dec 2023 09:58:35 +0800 | ||
4 | Subject: [PATCH] ARLH DID open source (#6286) | ||
5 | |||
6 | Co-authored-by: huangli <li.h.huang@intel.com> | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/66f1b4d60a367eb1b0774e0b4369f906e0e632ae] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | |||
11 | --- | ||
12 | _studio/shared/include/mfxstructures-int.h | 7 ++++++- | ||
13 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/_studio/shared/include/mfxstructures-int.h b/_studio/shared/include/mfxstructures-int.h | ||
16 | index 363d9a63..8f16b0a8 100644 | ||
17 | --- a/_studio/shared/include/mfxstructures-int.h | ||
18 | +++ b/_studio/shared/include/mfxstructures-int.h | ||
19 | @@ -1,4 +1,4 @@ | ||
20 | -// Copyright (c) 2007-2021 Intel Corporation | ||
21 | +// Copyright (c) 2007-2023 Intel Corporation | ||
22 | // | ||
23 | // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
24 | // of this software and associated documentation files (the "Software"), to deal | ||
25 | @@ -569,6 +569,11 @@ typedef struct { | ||
26 | /* ARL S */ | ||
27 | { 0x7D67, MFX_HW_ARL, MFX_GT2 }, | ||
28 | |||
29 | + /* ARL H*/ | ||
30 | + { 0x7D51, MFX_HW_ARL, MFX_GT2 }, | ||
31 | + { 0x7DD1, MFX_HW_ARL, MFX_GT2 }, | ||
32 | + { 0x7D41, MFX_HW_ARL, MFX_GT2 }, | ||
33 | + | ||
34 | }; | ||
35 | |||
36 | /* | ||
37 | -- | ||
38 | 2.40.1 | ||
39 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch new file mode 100644 index 00000000..8e014c97 --- /dev/null +++ b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From e118062518c95d8fb0080cc8276b123a90bd0eb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Wed, 21 Feb 2024 17:11:52 +0800 | ||
4 | Subject: [PATCH] Fix SetBuffersYV12() V & U plane offsets calculation (#6475) | ||
5 | |||
6 | Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
7 | Co-authored-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com> | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/ce704ddfe11724767ba86c9425a3917dc3100d4a] | ||
10 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
11 | --- | ||
12 | _studio/shared/src/libmfx_core_vaapi.cpp | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp | ||
16 | index 2cad86f8..fd5fc269 100644 | ||
17 | --- a/_studio/shared/src/libmfx_core_vaapi.cpp | ||
18 | +++ b/_studio/shared/src/libmfx_core_vaapi.cpp | ||
19 | @@ -462,8 +462,8 @@ public: | ||
20 | } | ||
21 | else | ||
22 | { | ||
23 | - eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[1] / 2); | ||
24 | - eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[2] / 2); | ||
25 | + eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[0]); | ||
26 | + eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[1] / 2); | ||
27 | } | ||
28 | eb.num_planes = 3; | ||
29 | eb.data_size = eb.offsets[2] + (eb.height * eb.pitches[2] / 2); | ||
30 | -- | ||
31 | 2.40.1 | ||
32 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch new file mode 100644 index 00000000..e3854407 --- /dev/null +++ b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch | |||
@@ -0,0 +1,96 @@ | |||
1 | From 40c0bc6d3dfe172dd25908df2c16de29c34fa4d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: gfxVPLsdm <gfxvplsdm@intel.com> | ||
3 | Date: Mon, 5 Feb 2024 17:14:07 +0800 | ||
4 | Subject: [PATCH] [JPEGe] Enable BGR4 JPEG Enc support (#6470) | ||
5 | |||
6 | Co-authored-by: vcheah <vincent.beng.keat.cheah@intel.com> | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/e73763d05f8fdc348c356b58dcb83075b5e868f8] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | .../mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | 6 ++++-- | ||
12 | .../encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | 9 +++++---- | ||
13 | 2 files changed, 9 insertions(+), 6 deletions(-) | ||
14 | |||
15 | diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
16 | index 141564b1..332f6372 100644 | ||
17 | --- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
18 | +++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp | ||
19 | @@ -212,7 +212,8 @@ mfxStatus MFXVideoENCODEMJPEG_HW::QueryImplsDescription( | ||
20 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YV12; | ||
21 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YUY2; | ||
22 | ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_RGB4; | ||
23 | - memCaps.NumColorFormats = 4; | ||
24 | + ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_BGR4; | ||
25 | + memCaps.NumColorFormats = 5; | ||
26 | |||
27 | ah.PushBack(profileCaps.MemDesc); | ||
28 | profileCaps.MemDesc[1] = profileCaps.MemDesc[0]; | ||
29 | @@ -392,7 +393,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Query(VideoCORE * core, mfxVideoParam *in, mfx | ||
30 | if ((fourCC == 0 && chromaFormat == 0) || | ||
31 | (fourCC == MFX_FOURCC_NV12 && (chromaFormat == MFX_CHROMAFORMAT_YUV420 || chromaFormat == MFX_CHROMAFORMAT_YUV400)) || | ||
32 | (fourCC == MFX_FOURCC_YUY2 && chromaFormat == MFX_CHROMAFORMAT_YUV422H) || | ||
33 | - (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)) | ||
34 | + ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444)) | ||
35 | { | ||
36 | out->mfx.FrameInfo.FourCC = in->mfx.FrameInfo.FourCC; | ||
37 | out->mfx.FrameInfo.ChromaFormat = in->mfx.FrameInfo.ChromaFormat; | ||
38 | @@ -698,6 +699,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Init(mfxVideoParam *par) | ||
39 | doubleBytesPerPx = 4; | ||
40 | break; | ||
41 | case MFX_FOURCC_RGB4: | ||
42 | + case MFX_FOURCC_BGR4: | ||
43 | default: | ||
44 | doubleBytesPerPx = 8; | ||
45 | break; | ||
46 | diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
47 | index 3fc619d1..b1ab556e 100644 | ||
48 | --- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
49 | +++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp | ||
50 | @@ -108,6 +108,7 @@ mfxStatus MfxHwMJpegEncode::CheckJpegParam(VideoCORE *core, mfxVideoParam & par, | ||
51 | BytesPerPx = 2; | ||
52 | break; | ||
53 | case MFX_FOURCC_RGB4: | ||
54 | + case MFX_FOURCC_BGR4: | ||
55 | default: | ||
56 | BytesPerPx = 4; | ||
57 | } | ||
58 | @@ -157,7 +158,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
59 | |||
60 | m_payload_base.length = 0; | ||
61 | m_payload_list.clear(); | ||
62 | - if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
63 | + if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
64 | { | ||
65 | m_app14_data.header = 0xEEFF;//APP14 | ||
66 | m_app14_data.lenH = 0; | ||
67 | @@ -287,7 +288,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
68 | m_pps.num_components = 3; | ||
69 | else if (fourCC == MFX_FOURCC_NV12 && chromaFormat == MFX_CHROMAFORMAT_YUV400) | ||
70 | m_pps.num_components = 1; | ||
71 | - else if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
72 | + else if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444) | ||
73 | m_pps.num_components = 3; | ||
74 | else | ||
75 | MFX_RETURN(MFX_ERR_UNDEFINED_BEHAVIOR); | ||
76 | @@ -341,7 +342,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
77 | { | ||
78 | // No external tables - use Quality parameter | ||
79 | m_dqt_list.resize(0); | ||
80 | - if (fourCC == MFX_FOURCC_RGB4) | ||
81 | + if (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) | ||
82 | { | ||
83 | m_pps.quantiser_table_selector[0] = 0; | ||
84 | m_pps.quantiser_table_selector[1] = 0; | ||
85 | @@ -393,7 +394,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c | ||
86 | { | ||
87 | m_dht_list.resize(0); | ||
88 | } | ||
89 | - else if (hwCaps->MaxNumHuffTable == 1 || fourCC == MFX_FOURCC_RGB4) | ||
90 | + else if (hwCaps->MaxNumHuffTable == 1 || (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)) | ||
91 | { | ||
92 | m_dht_list.resize(1); | ||
93 | |||
94 | -- | ||
95 | 2.40.1 | ||
96 | |||
diff --git a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch b/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch new file mode 100644 index 00000000..762a4902 --- /dev/null +++ b/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 630c32194f53c70f4f654fb3d198790df253ba1f Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Thu, 15 Jun 2023 13:43:32 +0200 | ||
4 | Subject: [PATCH] vpl.pc.in: dont pass pcfiledir to cflags | ||
5 | |||
6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
7 | |||
8 | Upstream-Status: Inappropriate [oe specific] | ||
9 | --- | ||
10 | libvpl/pkgconfig/vpl.pc.in | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/libvpl/pkgconfig/vpl.pc.in b/libvpl/pkgconfig/vpl.pc.in | ||
14 | index ab468a9..05c020e 100644 | ||
15 | --- a/libvpl/pkgconfig/vpl.pc.in | ||
16 | +++ b/libvpl/pkgconfig/vpl.pc.in | ||
17 | @@ -8,6 +8,6 @@ Description: oneAPI Video Processing Library | ||
18 | Version: @API_VERSION_MAJOR@.@API_VERSION_MINOR@ | ||
19 | URL: https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html | ||
20 | |||
21 | -Libs: -L${libdir} -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@ | ||
22 | +Libs: -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@ | ||
23 | Libs.private: @VPL_PKGCONFIG_PRIVATE_LIBS@ | ||
24 | -Cflags: -I${includedir} -I${includedir}/vpl | ||
25 | +Cflags: -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/vpl | ||
26 | -- | ||
27 | 2.40.1 | ||
28 | |||
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_22.5.4.bb b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb index b89a8ce8..0b849bf1 100644 --- a/recipes-multimedia/onevpl/onevpl-intel-gpu_22.5.4.bb +++ b/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb | |||
@@ -15,11 +15,15 @@ COMPATIBLE_HOST = '(x86_64).*-linux' | |||
15 | COMPATIBLE_HOST:x86-x32 = "null" | 15 | COMPATIBLE_HOST:x86-x32 = "null" |
16 | 16 | ||
17 | DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native" | 17 | DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native" |
18 | RDEPENDS:${PN} += "intel-media-driver" | ||
18 | 19 | ||
19 | SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \ | 20 | SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \ |
21 | file://0001-ARLH-DID-open-source-6286.patch \ | ||
22 | file://0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch \ | ||
23 | file://0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch \ | ||
20 | " | 24 | " |
21 | 25 | ||
22 | SRCREV = "4a8f62f498eddc96473789a5d5e204ec84b69330" | 26 | SRCREV = "852fa9f705ef44c004d014548601f3804a6de705" |
23 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
24 | 28 | ||
25 | FILES:${PN} += " \ | 29 | FILES:${PN} += " \ |
diff --git a/recipes-multimedia/onevpl/onevpl/0001-Enable-xdg_shell-for-weston10.patch b/recipes-multimedia/onevpl/onevpl/0001-Enable-xdg_shell-for-weston10.patch deleted file mode 100644 index 17e4e380..00000000 --- a/recipes-multimedia/onevpl/onevpl/0001-Enable-xdg_shell-for-weston10.patch +++ /dev/null | |||
@@ -1,291 +0,0 @@ | |||
1 | From 38bd0f212bf6cfd65f836913dca1098113fa2e8d Mon Sep 17 00:00:00 2001 | ||
2 | From: "Cheah, Vincent Beng Keat" <vincent.beng.keat.cheah@intel.com> | ||
3 | Date: Mon, 3 Oct 2022 16:06:38 +0800 | ||
4 | Subject: [PATCH] Enable xdg_shell for weston10 | ||
5 | |||
6 | Tested command: ./sample_decode h264 -vaapi -hw -i test.h264 -rwld | ||
7 | |||
8 | Upstream-Status: Submitted [innersource PR: #518 ] | ||
9 | |||
10 | Signed-off-by: Cheah, Vincent Beng Keat <vincent.beng.keat.cheah@intel.com> | ||
11 | --- | ||
12 | tools/legacy/sample_common/CMakeLists.txt | 15 +++++ | ||
13 | .../legacy/sample_misc/wayland/CMakeLists.txt | 34 ++++++++++ | ||
14 | .../wayland/include/class_wayland.h | 8 +++ | ||
15 | .../wayland/include/listener_wayland.h | 16 +++++ | ||
16 | .../sample_misc/wayland/src/class_wayland.cpp | 66 ++++++++++++++++--- | ||
17 | .../wayland/src/listener_wayland.cpp | 23 +++++++ | ||
18 | 6 files changed, 153 insertions(+), 9 deletions(-) | ||
19 | |||
20 | diff --git a/tools/legacy/sample_common/CMakeLists.txt b/tools/legacy/sample_common/CMakeLists.txt | ||
21 | index c13749a..3f70465 100644 | ||
22 | --- a/tools/legacy/sample_common/CMakeLists.txt | ||
23 | +++ b/tools/legacy/sample_common/CMakeLists.txt | ||
24 | @@ -200,6 +200,12 @@ if(CMAKE_SYSTEM_NAME MATCHES Linux) | ||
25 | WAYLAND_LINUX_DMABUF_XML_PATH linux-dmabuf-unstable-v1.xml | ||
26 | PATHS ${WAYLAND_PROTOCOLS_PATH}/unstable/linux-dmabuf | ||
27 | NO_DEFAULT_PATH) | ||
28 | + | ||
29 | + find_file( | ||
30 | + WAYLAND_LINUX_XDG_SHELL_XML_PATH xdg-shell.xml | ||
31 | + PATHS ${WAYLAND_PROTOCOLS_PATH}/stable/xdg-shell | ||
32 | + NO_DEFAULT_PATH) | ||
33 | + | ||
34 | endif() | ||
35 | else() | ||
36 | message( | ||
37 | @@ -216,6 +222,15 @@ if(CMAKE_SYSTEM_NAME MATCHES Linux) | ||
38 | PUBLIC ${CMAKE_BINARY_DIR}/tools/legacy/sample_misc/wayland) | ||
39 | endif() | ||
40 | |||
41 | + if(WAYLAND_LINUX_XDG_SHELL_XML_PATH) | ||
42 | + target_compile_definitions(${TARGET} | ||
43 | + PUBLIC WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
44 | + | ||
45 | + target_include_directories( | ||
46 | + ${TARGET} | ||
47 | + PUBLIC ${CMAKE_BINARY_DIR}/tools/legacy/sample_misc/wayland) | ||
48 | + endif() | ||
49 | + | ||
50 | else() | ||
51 | message( | ||
52 | SEND_ERROR | ||
53 | diff --git a/tools/legacy/sample_misc/wayland/CMakeLists.txt b/tools/legacy/sample_misc/wayland/CMakeLists.txt | ||
54 | index 9a272f9..470a763 100644 | ||
55 | --- a/tools/legacy/sample_misc/wayland/CMakeLists.txt | ||
56 | +++ b/tools/legacy/sample_misc/wayland/CMakeLists.txt | ||
57 | @@ -36,6 +36,40 @@ if(PKGConfig_LIBDRM_FOUND) | ||
58 | ${CMAKE_CURRENT_SOURCE_DIR}/src/listener_wayland.cpp | ||
59 | ${CMAKE_CURRENT_SOURCE_DIR}/src/wayland-drm-protocol.c) | ||
60 | |||
61 | + if(WAYLAND_SCANNER_BIN | ||
62 | + AND PKG_WAYLAND_PROTCOLS_FOUND | ||
63 | + AND WAYLAND_LINUX_XDG_SHELL_XML_PATH) | ||
64 | + execute_process( | ||
65 | + COMMAND | ||
66 | + "${WAYLAND_SCANNER_BIN_PATH}\/${WAYLAND_SCANNER_BIN}" "client-header" | ||
67 | + "${WAYLAND_LINUX_XDG_SHELL_XML_PATH}" | ||
68 | + "tools/legacy/sample_misc/wayland/xdg-shell-client-protocol.h" | ||
69 | + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | ||
70 | + RESULT_VARIABLE WAYLAND_SCANNER_RESULT) | ||
71 | + if(WAYLAND_SCANNER_RESULT) | ||
72 | + message(FATAL_ERROR "Failed to generate xdg-shell-client-protocol.h") | ||
73 | + endif() | ||
74 | + | ||
75 | + execute_process( | ||
76 | + COMMAND | ||
77 | + "${WAYLAND_SCANNER_BIN_PATH}\/${WAYLAND_SCANNER_BIN}" "private-code" | ||
78 | + "${WAYLAND_LINUX_XDG_SHELL_XML_PATH}" | ||
79 | + "tools/legacy/sample_misc/wayland/xdg-shell-protocol.c" | ||
80 | + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | ||
81 | + RESULT_VARIABLE WAYLAND_SCANNER_RESULT) | ||
82 | + if(WAYLAND_SCANNER_RESULT) | ||
83 | + message(FATAL_ERROR "Failed to generate xdg-shell-protocol.c") | ||
84 | + endif() | ||
85 | + | ||
86 | + target_include_directories( | ||
87 | + ${TARGET} PRIVATE ${CMAKE_BINARY_DIR}/tools/legacy/sample_misc/wayland) | ||
88 | + target_sources( | ||
89 | + ${TARGET} | ||
90 | + PRIVATE | ||
91 | + ${CMAKE_BINARY_DIR}/tools/legacy/sample_misc/wayland/xdg-shell-protocol.c | ||
92 | + ) | ||
93 | + endif() | ||
94 | + | ||
95 | if(WAYLAND_SCANNER_BIN | ||
96 | AND PKG_WAYLAND_PROTCOLS_FOUND | ||
97 | AND WAYLAND_LINUX_DMABUF_XML_PATH) | ||
98 | diff --git a/tools/legacy/sample_misc/wayland/include/class_wayland.h b/tools/legacy/sample_misc/wayland/include/class_wayland.h | ||
99 | index edaeefd..02c361c 100644 | ||
100 | --- a/tools/legacy/sample_misc/wayland/include/class_wayland.h | ||
101 | +++ b/tools/legacy/sample_misc/wayland/include/class_wayland.h | ||
102 | @@ -22,6 +22,9 @@ extern "C" { | ||
103 | #if defined(WAYLAND_LINUX_DMABUF_SUPPORT) | ||
104 | #include "linux-dmabuf-unstable-v1.h" | ||
105 | #endif | ||
106 | + #if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
107 | + #include "xdg-shell-client-protocol.h" | ||
108 | + #endif | ||
109 | |||
110 | typedef struct buffer wld_buffer; | ||
111 | |||
112 | @@ -158,6 +161,11 @@ private: | ||
113 | struct wl_event_queue* m_event_queue; | ||
114 | volatile int m_pending_frame; | ||
115 | struct ShmPool* m_shm_pool; | ||
116 | + #if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
117 | + struct xdg_wm_base* m_xdg_wm_base; | ||
118 | + struct xdg_surface* m_xdg_surface; | ||
119 | + struct xdg_toplevel* m_xdg_toplevel; | ||
120 | + #endif | ||
121 | int m_display_fd; | ||
122 | int m_fd; | ||
123 | struct pollfd m_poll; | ||
124 | diff --git a/tools/legacy/sample_misc/wayland/include/listener_wayland.h b/tools/legacy/sample_misc/wayland/include/listener_wayland.h | ||
125 | index 25ee3a1..8401e2b 100644 | ||
126 | --- a/tools/legacy/sample_misc/wayland/include/listener_wayland.h | ||
127 | +++ b/tools/legacy/sample_misc/wayland/include/listener_wayland.h | ||
128 | @@ -40,4 +40,20 @@ void shell_surface_configure(void* data, | ||
129 | void handle_done(void* data, struct wl_callback* callback, uint32_t time); | ||
130 | |||
131 | void buffer_release(void* data, struct wl_buffer* buffer); | ||
132 | + | ||
133 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
134 | +/* xdg shell */ | ||
135 | +void xdg_wm_base_ping(void* data, struct xdg_wm_base* xdg_wm_base, uint32_t serial); | ||
136 | + | ||
137 | +void xdg_surface_configure(void* data, struct xdg_surface* xdg_surface, uint32_t serial); | ||
138 | + | ||
139 | +void xdg_toplevel_configure(void* data, | ||
140 | + struct xdg_toplevel* xdg_toplevel, | ||
141 | + int32_t width, | ||
142 | + int32_t height, | ||
143 | + struct wl_array* states); | ||
144 | + | ||
145 | +void xdg_toplevel_close(void* data, struct xdg_toplevel* xdg_toplevel); | ||
146 | +#endif | ||
147 | + | ||
148 | #endif /* LISTENER_WAYLAND_H */ | ||
149 | diff --git a/tools/legacy/sample_misc/wayland/src/class_wayland.cpp b/tools/legacy/sample_misc/wayland/src/class_wayland.cpp | ||
150 | index 41b7969..428b844 100644 | ||
151 | --- a/tools/legacy/sample_misc/wayland/src/class_wayland.cpp | ||
152 | +++ b/tools/legacy/sample_misc/wayland/src/class_wayland.cpp | ||
153 | @@ -49,6 +49,11 @@ Wayland::Wayland() | ||
154 | m_event_queue(NULL), | ||
155 | m_pending_frame(0), | ||
156 | m_shm_pool(NULL), | ||
157 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
158 | + m_xdg_wm_base(NULL), | ||
159 | + m_xdg_surface(NULL), | ||
160 | + m_xdg_toplevel(NULL), | ||
161 | +#endif | ||
162 | m_display_fd(-1), | ||
163 | m_fd(-1), | ||
164 | m_bufmgr(NULL), | ||
165 | @@ -89,6 +94,11 @@ int Wayland::DisplayRoundtrip() { | ||
166 | } | ||
167 | |||
168 | bool Wayland::CreateSurface() { | ||
169 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
170 | + static struct xdg_surface_listener xdg_surface_listener = { xdg_surface_configure }; | ||
171 | + static struct xdg_toplevel_listener xdg_toplevel_listener = { xdg_toplevel_configure, | ||
172 | + xdg_toplevel_close }; | ||
173 | +#endif | ||
174 | static const struct wl_shell_surface_listener shell_surface_listener = { | ||
175 | shell_surface_ping, | ||
176 | shell_surface_configure | ||
177 | @@ -98,16 +108,38 @@ bool Wayland::CreateSurface() { | ||
178 | if (NULL == m_surface) | ||
179 | return false; | ||
180 | |||
181 | - m_shell_surface = wl_shell_get_shell_surface(m_shell, m_surface); | ||
182 | - if (NULL == m_shell_surface) { | ||
183 | - wl_surface_destroy(m_surface); | ||
184 | - return false; | ||
185 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
186 | + if (m_xdg_wm_base) { | ||
187 | + m_shell = NULL; | ||
188 | + m_xdg_surface = xdg_wm_base_get_xdg_surface(m_xdg_wm_base, m_surface); | ||
189 | + if (nullptr == m_xdg_surface) { | ||
190 | + xdg_surface_destroy(m_xdg_surface); | ||
191 | + return false; | ||
192 | + } | ||
193 | + | ||
194 | + xdg_surface_add_listener(m_xdg_surface, &xdg_surface_listener, 0); | ||
195 | + m_xdg_toplevel = xdg_surface_get_toplevel(m_xdg_surface); | ||
196 | + if (nullptr == m_xdg_toplevel) | ||
197 | + return false; | ||
198 | + | ||
199 | + xdg_toplevel_add_listener(m_xdg_toplevel, &xdg_toplevel_listener, 0); | ||
200 | + wl_surface_commit(m_surface); | ||
201 | + wl_display_dispatch(m_display); | ||
202 | } | ||
203 | +#endif | ||
204 | |||
205 | - wl_shell_surface_add_listener(m_shell_surface, &shell_surface_listener, 0); | ||
206 | - wl_shell_surface_set_toplevel(m_shell_surface); | ||
207 | - wl_shell_surface_set_user_data(m_shell_surface, m_surface); | ||
208 | - wl_surface_set_user_data(m_surface, NULL); | ||
209 | + if (m_shell) { | ||
210 | + m_shell_surface = wl_shell_get_shell_surface(m_shell, m_surface); | ||
211 | + if (NULL == m_shell_surface) { | ||
212 | + wl_surface_destroy(m_surface); | ||
213 | + return false; | ||
214 | + } | ||
215 | + | ||
216 | + wl_shell_surface_add_listener(m_shell_surface, &shell_surface_listener, 0); | ||
217 | + wl_shell_surface_set_toplevel(m_shell_surface); | ||
218 | + wl_shell_surface_set_user_data(m_shell_surface, m_surface); | ||
219 | + wl_surface_set_user_data(m_surface, NULL); | ||
220 | + } | ||
221 | return true; | ||
222 | } | ||
223 | |||
224 | @@ -116,6 +148,12 @@ void Wayland::FreeSurface() { | ||
225 | wl_shell_surface_destroy(m_shell_surface); | ||
226 | if (NULL != m_surface) | ||
227 | wl_surface_destroy(m_surface); | ||
228 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
229 | + if (nullptr != m_xdg_toplevel) | ||
230 | + xdg_toplevel_destroy(m_xdg_toplevel); | ||
231 | + if (nullptr != m_xdg_surface) | ||
232 | + xdg_surface_destroy(m_xdg_surface); | ||
233 | +#endif | ||
234 | } | ||
235 | |||
236 | void Wayland::Sync() { | ||
237 | @@ -370,9 +408,19 @@ void Wayland::RegistryGlobal(struct wl_registry* registry, | ||
238 | if (0 == strcmp(interface, "wl_compositor")) | ||
239 | m_compositor = static_cast<wl_compositor*>( | ||
240 | wl_registry_bind(registry, name, &wl_compositor_interface, version)); | ||
241 | - else if (0 == strcmp(interface, "wl_shell")) | ||
242 | + else if (0 == strcmp(interface, "wl_shell")) { | ||
243 | m_shell = | ||
244 | static_cast<wl_shell*>(wl_registry_bind(registry, name, &wl_shell_interface, version)); | ||
245 | + } | ||
246 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
247 | + else if (0 == strcmp(interface, "xdg_wm_base")) { | ||
248 | + static const struct xdg_wm_base_listener xdg_wm_base_listener = { xdg_wm_base_ping }; | ||
249 | + m_xdg_wm_base = | ||
250 | + static_cast<xdg_wm_base*>(wl_registry_bind(registry, name, &xdg_wm_base_interface, 1)); | ||
251 | + | ||
252 | + xdg_wm_base_add_listener(m_xdg_wm_base, &xdg_wm_base_listener, this); | ||
253 | + } | ||
254 | +#endif | ||
255 | else if (0 == strcmp(interface, "wl_drm")) { | ||
256 | static const struct wl_drm_listener drm_listener = { drm_handle_device, | ||
257 | drm_handle_format, | ||
258 | diff --git a/tools/legacy/sample_misc/wayland/src/listener_wayland.cpp b/tools/legacy/sample_misc/wayland/src/listener_wayland.cpp | ||
259 | index 71d617e..b62cd70 100644 | ||
260 | --- a/tools/legacy/sample_misc/wayland/src/listener_wayland.cpp | ||
261 | +++ b/tools/legacy/sample_misc/wayland/src/listener_wayland.cpp | ||
262 | @@ -65,3 +65,26 @@ void buffer_release(void* data, struct wl_buffer* buffer) { | ||
263 | wl_buffer_destroy(buffer); | ||
264 | buffer = NULL; | ||
265 | } | ||
266 | + | ||
267 | +#if defined(WAYLAND_LINUX_XDG_SHELL_SUPPORT) | ||
268 | +/* xdg shell */ | ||
269 | +void xdg_wm_base_ping(void* data, struct xdg_wm_base* xdg_wm_base, uint32_t serial) { | ||
270 | + xdg_wm_base_pong(xdg_wm_base, serial); | ||
271 | +} | ||
272 | + | ||
273 | +void xdg_surface_configure(void* data, struct xdg_surface* xdg_surface, uint32_t serial) { | ||
274 | + xdg_surface_ack_configure(xdg_surface, serial); | ||
275 | +} | ||
276 | + | ||
277 | +void xdg_toplevel_configure(void* data, | ||
278 | + struct xdg_toplevel* xdg_toplevel, | ||
279 | + int32_t width, | ||
280 | + int32_t height, | ||
281 | + struct wl_array* states) { | ||
282 | + /* NOT IMPLEMENTED */ | ||
283 | +} | ||
284 | + | ||
285 | +void xdg_toplevel_close(void* data, struct xdg_toplevel* xdg_toplevel) { | ||
286 | + /* NOT IMPLEMENTED */ | ||
287 | +} | ||
288 | +#endif | ||
289 | -- | ||
290 | 2.37.2 | ||
291 | |||
diff --git a/recipes-multimedia/onevpl/onevpl/0001-Fix-missing-UYVY-VA_FOURCC-causing-encode-failure.patch b/recipes-multimedia/onevpl/onevpl/0001-Fix-missing-UYVY-VA_FOURCC-causing-encode-failure.patch deleted file mode 100644 index c748c818..00000000 --- a/recipes-multimedia/onevpl/onevpl/0001-Fix-missing-UYVY-VA_FOURCC-causing-encode-failure.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 943f228402fa5ec3a1b4fd898e2783bb314af5a4 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Mazlan, Hilman Zafri" <hilman.zafri.mazlan@intel.com> | ||
3 | Date: Thu, 8 Sep 2022 11:06:33 +0800 | ||
4 | Subject: [PATCH] Fix missing UYVY VA_FOURCC causing encode failure | ||
5 | |||
6 | Upstream-Status: Submitted [Innersource PR: #504] | ||
7 | |||
8 | Signed-off-by: Mazlan, Hilman Zafri <hilman.zafri.mazlan@intel.com> | ||
9 | --- | ||
10 | tools/legacy/sample_common/src/vaapi_allocator.cpp | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/tools/legacy/sample_common/src/vaapi_allocator.cpp b/tools/legacy/sample_common/src/vaapi_allocator.cpp | ||
14 | index b374a6cb..e3c286e9 100644 | ||
15 | --- a/tools/legacy/sample_common/src/vaapi_allocator.cpp | ||
16 | +++ b/tools/legacy/sample_common/src/vaapi_allocator.cpp | ||
17 | @@ -129,7 +129,7 @@ static mfxStatus GetVAFourcc(mfxU32 fourcc, unsigned int& va_fourcc) { | ||
18 | mfxU32 mfx_fourcc = ConvertVP8FourccToMfxFourcc(fourcc); | ||
19 | va_fourcc = ConvertMfxFourccToVAFormat(mfx_fourcc); | ||
20 | if (!va_fourcc || ((VA_FOURCC_NV12 != va_fourcc) && (VA_FOURCC_YV12 != va_fourcc) && | ||
21 | - (VA_FOURCC_YUY2 != va_fourcc) && (VA_FOURCC_ARGB != va_fourcc) && | ||
22 | + (VA_FOURCC_UYVY != va_fourcc) && (VA_FOURCC_ARGB != va_fourcc) && | ||
23 | (VA_FOURCC_ABGR != va_fourcc) && (VA_FOURCC_P208 != va_fourcc) && | ||
24 | (VA_FOURCC_P010 != va_fourcc) && (VA_FOURCC_YUY2 != va_fourcc) && | ||
25 | (VA_FOURCC_Y210 != va_fourcc) && (VA_FOURCC_Y410 != va_fourcc) && | ||
26 | -- | ||
27 | 2.34.1 | ||
28 | |||
diff --git a/recipes-multimedia/onevpl/onevpl_2022.2.2.bb b/recipes-multimedia/onevpl/onevpl_2023.4.0.bb index 9e0196c1..513c7f2c 100644 --- a/recipes-multimedia/onevpl/onevpl_2022.2.2.bb +++ b/recipes-multimedia/onevpl/onevpl_2023.4.0.bb | |||
@@ -6,13 +6,12 @@ that works across a wide range of accelerators." | |||
6 | HOMEPAGE = "https://github.com/oneapi-src/oneVPL" | 6 | HOMEPAGE = "https://github.com/oneapi-src/oneVPL" |
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \ |
9 | file://third-party-programs.txt;md5=f43d223f2b736e89abed9660483d0386" | 9 | file://third-party-programs.txt;md5=0e35a23482445dd089b4eabe19103a06" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \ |
12 | file://0001-Fix-missing-UYVY-VA_FOURCC-causing-encode-failure.patch \ | 12 | file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \ |
13 | file://0001-Enable-xdg_shell-for-weston10.patch \ | ||
14 | " | 13 | " |
15 | SRCREV = "15b79165c30fc4a7bf6efdf261a39b128b63b896" | 14 | SRCREV = "2274efcd3672b43297ef774f332e1fed6781381c" |
16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
17 | 16 | ||
18 | inherit cmake | 17 | inherit cmake |
@@ -28,14 +27,14 @@ do_install:append() { | |||
28 | 27 | ||
29 | COMPATIBLE_HOST = '(x86_64).*-linux' | 28 | COMPATIBLE_HOST = '(x86_64).*-linux' |
30 | 29 | ||
31 | PACKAGES += "${PN}-examples" | 30 | PACKAGES =+ "${PN}-examples" |
32 | 31 | ||
33 | FILES:${PN}-examples = "${datadir}/oneVPL/examples \ | 32 | FILES:${PN}-examples = "${datadir}/vpl \ |
34 | " | 33 | " |
35 | 34 | ||
36 | FILES_SOLIBSDEV = "" | 35 | FILES_SOLIBSDEV = "" |
37 | FILES:${PN}-dev += "${libdir}/libvpl.so" | 36 | FILES:${PN}-dev += "${libdir}/libvpl.so" |
38 | 37 | ||
39 | FILES:${PN} += "${datadir} \ | 38 | FILES:${PN} += " ${datadir}/oneVPL/samples \ |
40 | ${libdir}/vpl/libvpl_wayland.so \ | 39 | ${libdir}/vpl/libvpl_wayland.so \ |
41 | " | 40 | " |
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch new file mode 100644 index 00000000..c47c8de5 --- /dev/null +++ b/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 3b7b4eca54aa8d851e37f60c74e4a027fa7b21f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 14 Jun 2023 13:18:45 +0800 | ||
4 | Subject: [PATCH] crypto-mb: Make sure libs are installed correctly | ||
5 | |||
6 | Dont assume that "lib" is always the correct destination. This fixes | ||
7 | multilib builds when libdir != /usr/lib. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | sources/ippcp/crypto_mb/src/CMakeLists.txt | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/sources/ippcp/crypto_mb/src/CMakeLists.txt b/sources/ippcp/crypto_mb/src/CMakeLists.txt | ||
17 | index c9cad06..31f52bd 100644 | ||
18 | --- a/sources/ippcp/crypto_mb/src/CMakeLists.txt | ||
19 | +++ b/sources/ippcp/crypto_mb/src/CMakeLists.txt | ||
20 | @@ -123,8 +123,8 @@ endif(DYNAMIC_LIB OR MB_STANDALONE) | ||
21 | # Installation of the shared library | ||
22 | if (MB_STANDALONE) # standalone crypto_mb's cmake run | ||
23 | install(TARGETS ${MB_DYN_LIB_TARGET} | ||
24 | - LIBRARY DESTINATION "lib" | ||
25 | - RUNTIME DESTINATION "lib" | ||
26 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
27 | + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
28 | PUBLIC_HEADER DESTINATION "include/crypto_mb") | ||
29 | elseif (DYNAMIC_LIB) # build from ippcp's cmake | ||
30 | install(TARGETS ${MB_DYN_LIB_TARGET} | ||
31 | @@ -154,7 +154,7 @@ endif() | ||
32 | # Static lib installation | ||
33 | if(MB_STANDALONE) | ||
34 | install(TARGETS ${MB_STATIC_LIB_TARGET} | ||
35 | - ARCHIVE DESTINATION "lib" | ||
36 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
37 | PUBLIC_HEADER DESTINATION "include/crypto_mb") | ||
38 | else() | ||
39 | install(TARGETS ${MB_STATIC_LIB_TARGET} | ||
40 | -- | ||
41 | 2.37.3 | ||
42 | |||
diff --git a/recipes-oneapi/crypto/intel-crypto-mb_2021.6.bb b/recipes-oneapi/crypto/intel-crypto-mb_2021.11.1.bb index 960aa17c..be72fd85 100644 --- a/recipes-oneapi/crypto/intel-crypto-mb_2021.6.bb +++ b/recipes-oneapi/crypto/intel-crypto-mb_2021.11.1.bb | |||
@@ -8,12 +8,14 @@ LICENSE = "Apache-2.0" | |||
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://../../../LICENSE;md5=e787af283468feca985d6b865d27d95b" | 9 | LIC_FILES_CHKSUM = "file://../../../LICENSE;md5=e787af283468feca985d6b865d27d95b" |
10 | 10 | ||
11 | SRC_URI = " \ | 11 | IPP_BRANCH = "ipp-crypto_${@'_'.join(d.getVar('PV').rsplit('.')[-3:])}" |
12 | git://github.com/intel/ipp-crypto;protocol=https;branch=develop \ | 12 | |
13 | file://0001-CMakeLists.txt-exclude-host-system-headers.patch;striplevel=4 \ | 13 | SRC_URI = "git://github.com/intel/ipp-crypto;protocol=https;branch=${IPP_BRANCH} \ |
14 | file://0002-cmake-exclude-Yocto-build-flags.patch;striplevel=4 \ | 14 | file://0001-CMakeLists.txt-exclude-host-system-headers.patch;striplevel=4 \ |
15 | " | 15 | file://0002-cmake-exclude-Yocto-build-flags.patch;striplevel=4 \ |
16 | SRCREV = "3ae57715fbc7383ef527cab0b824d736b60fa06d" | 16 | file://0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch;striplevel=4 \ |
17 | " | ||
18 | SRCREV = "d02611e34328898d16025467d3deeb7d62b6076b" | ||
17 | 19 | ||
18 | S = "${WORKDIR}/git/sources/ippcp/crypto_mb" | 20 | S = "${WORKDIR}/git/sources/ippcp/crypto_mb" |
19 | 21 | ||
diff --git a/recipes-oneapi/onedpl/onedpl_2021.7.0.bb b/recipes-oneapi/onedpl/onedpl_2022.3.0.bb index c3533823..d80b64c9 100644 --- a/recipes-oneapi/onedpl/onedpl_2021.7.0.bb +++ b/recipes-oneapi/onedpl/onedpl_2022.3.0.bb | |||
@@ -7,13 +7,13 @@ HOMEPAGE = "https://github.com/oneapi-src/oneDPL" | |||
7 | 7 | ||
8 | LICENSE = "Apache-2.0-with-LLVM-exception" | 8 | LICENSE = "Apache-2.0-with-LLVM-exception" |
9 | LIC_FILES_CHKSUM = "file://licensing/LICENSE.txt;md5=2e982d844baa4df1c80de75470e0c5cb \ | 9 | LIC_FILES_CHKSUM = "file://licensing/LICENSE.txt;md5=2e982d844baa4df1c80de75470e0c5cb \ |
10 | file://licensing/third-party-programs.txt;md5=74cbe473c3521af32a92f662c44aa6bd" | 10 | file://licensing/third-party-programs.txt;md5=cfb8d6b1f04a8fcc7d0dddd817619634" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/oneapi-src/oneDPL.git;protocol=https;branch=release/2021.7 \ | 14 | SRC_URI = "git://github.com/oneapi-src/oneDPL.git;protocol=https;branch=release/2022.3 \ |
15 | " | 15 | " |
16 | SRCREV = "df96969b76f075bd9ce14c303659595c747c7223" | 16 | SRCREV = "180f18ad25fbc39fa13bad43f1df7d54ee8f5609" |
17 | 17 | ||
18 | do_compile[noexec] = "1" | 18 | do_compile[noexec] = "1" |
19 | do_configure[noexec] = "1" | 19 | do_configure[noexec] = "1" |
diff --git a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2022.0.1-3633.bb b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb index 702f794e..702f794e 100644 --- a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2022.0.1-3633.bb +++ b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb | |||
diff --git a/recipes-support/isa-l/isa-l_2.30.0.bb b/recipes-support/isa-l/isa-l_2.31.0.bb index 3a4cea14..d5d09002 100644 --- a/recipes-support/isa-l/isa-l_2.30.0.bb +++ b/recipes-support/isa-l/isa-l_2.31.0.bb | |||
@@ -2,16 +2,18 @@ SUMMARY = "Intelligent Storage Acceleration Library" | |||
2 | DESCRIPTION = "ISA-L is a collection of optimized low-level functions \ | 2 | DESCRIPTION = "ISA-L is a collection of optimized low-level functions \ |
3 | targeting storage applications." | 3 | targeting storage applications." |
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e6c7d82ad7dd512687b0991a159a1ca9" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2476688d0948d4a3f7c69473a603540d" |
6 | SECTION = "lib" | 6 | SECTION = "lib" |
7 | 7 | ||
8 | inherit autotools pkgconfig | 8 | inherit autotools pkgconfig |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | SRCREV = "2df39cf5f1b9ccaa2973f6ef273857e4dc46f0cf" | 11 | SRCREV = "bd226375027899087bd48f3e59b910430615cc0a" |
12 | SRC_URI = "git://github.com/intel/isa-l.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/intel/isa-l.git;branch=master;protocol=https" |
13 | 13 | ||
14 | DEPENDS = "nasm-native" | 14 | DEPENDS = "nasm-native" |
15 | AS[unexport] = "1" | 15 | AS[unexport] = "1" |
16 | 16 | ||
17 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
18 | |||
17 | COMPATIBLE_HOST = '(x86_64).*-linux' | 19 | COMPATIBLE_HOST = '(x86_64).*-linux' |
diff --git a/recipes-support/jhi/jhi_1.41.bb b/recipes-support/jhi/jhi_1.41.bb deleted file mode 100644 index bbb30a6d..00000000 --- a/recipes-support/jhi/jhi_1.41.bb +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | SUMMARY = "Intel Dynamic Application Loader (DAL) Host Interface" | ||
2 | DESCRIPTION = "A daemon and libraries which allow user space applications \ | ||
3 | to install Java applets on DAL FW and communicate with them" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=833126f14614a3276708a4d7c9734645" | ||
6 | |||
7 | SRC_URI = "git://github.com/intel/dynamic-application-loader-host-interface.git;protocol=https;branch=master" | ||
8 | |||
9 | inherit cmake useradd systemd pkgconfig update-rc.d | ||
10 | |||
11 | SRCREV = "4c9ef52bcd55fa03b30ac323e553a05be858d41e" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | DEPENDS += "util-linux libxml2" | ||
16 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
17 | RDEPENDS:${PN} += "bash" | ||
18 | |||
19 | USERADD_PACKAGES = "${PN}" | ||
20 | USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false -g mei jhi" | ||
21 | |||
22 | GROUPADD_PARAM:${PN} = "-g 880 mei" | ||
23 | |||
24 | COMPATIBLE_HOST:libc-musl = 'null' | ||
25 | |||
26 | SYSTEMD_SERVICE:${PN} = "jhi.service" | ||
27 | |||
28 | INITSCRIPT_PACKAGES = "${PN}" | ||
29 | INITSCRIPT_NAME:${PN} = "${PN}" | ||
30 | INITSCRIPT_PARAMS:${PN} = "defaults" | ||
31 | |||
32 | # systemd is the default so they are installed when sysvinit is not selected as INIT_SYSTEM | ||
33 | EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \ | ||
34 | -DINIT_SYSTEM=${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'SysVinit', 'systemd', d)} \ | ||
35 | -DAPPLETS_DIR=${libdir}/dal/applets \ | ||
36 | -DAPP_REPO_DIR=${localstatedir}/cache/dal/applet_repository \ | ||
37 | " | ||
38 | |||
39 | do_install:append () { | ||
40 | install -d ${D}${localstatedir}/cache/dal/applet_repository | ||
41 | |||
42 | chown -R jhi ${D}${localstatedir}/cache/dal/applet_repository | ||
43 | chgrp -R mei ${D}${localstatedir}/cache/dal/applet_repository | ||
44 | |||
45 | install -d ${D}${bindir} | ||
46 | install -m 755 ${B}/bin_linux/smoketest ${D}${bindir} | ||
47 | install -m 755 ${B}/bin_linux/bist ${D}${bindir} | ||
48 | |||
49 | install -d ${D}${libdir}/dal/applets | ||
50 | cp -r ${S}/test/smoketest/applets/* ${D}${libdir}/dal/applets/ | ||
51 | } | ||
52 | |||
53 | PACKAGES += "${PN}-test" | ||
54 | |||
55 | FILES:${PN}-dev = "" | ||
56 | |||
57 | FILES:${PN} = "\ | ||
58 | ${sbindir} \ | ||
59 | ${sysconfdir} \ | ||
60 | ${libdir}/lib*${SOLIBSDEV} \ | ||
61 | ${libdir}/dal/applets/SpoolerApplet.dalp \ | ||
62 | ${nonarch_libdir}/tmpfiles.d \ | ||
63 | ${systemd_system_unitdir} \ | ||
64 | ${localstatedir}/cache/dal/applet_repository \ | ||
65 | " | ||
66 | |||
67 | FILES:${PN}-test = "\ | ||
68 | ${bindir} \ | ||
69 | ${libdir}/dal/applets \ | ||
70 | " | ||
71 | |||
72 | UPSTREAM_CHECK_COMMITS = "1" | ||
diff --git a/recipes-support/libipt/libipt_2.0.5.bb b/recipes-support/libipt/libipt_2.1.1.bb index c1f67c1d..c4b5ecaa 100644 --- a/recipes-support/libipt/libipt_2.0.5.bb +++ b/recipes-support/libipt/libipt_2.1.1.bb | |||
@@ -5,19 +5,20 @@ library or it can be partially or fully integrated into your tool." | |||
5 | HOMEPAGE = "https://github.com/intel/libipt" | 5 | HOMEPAGE = "https://github.com/intel/libipt" |
6 | 6 | ||
7 | LICENSE = "BSD-3-Clause" | 7 | LICENSE = "BSD-3-Clause" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bc005f06a45e41cdefcb8f5aceb1f5c9" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a429afa59f273b5d12778eda69d10313" |
9 | 9 | ||
10 | inherit pkgconfig cmake | 10 | inherit pkgconfig cmake |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/intel/libipt.git;protocol=https;branch=stable/v2.0" | 14 | SRC_URI = "git://github.com/intel/libipt.git;protocol=https;branch=stable/v2.1" |
15 | 15 | ||
16 | SRCREV = "e315d53984ebe0e40dbb71b213bcf2cba42496f4" | 16 | SRCREV = "1c9bc700f4b9a71fd2d1cf1742de7e2351ddb281" |
17 | 17 | ||
18 | EXTRA_OECMAKE += " \ | 18 | EXTRA_OECMAKE += " \ |
19 | -DPTDUMP=ON \ | 19 | -DPTDUMP=ON \ |
20 | -DPTTC=ON \ | 20 | -DPTTC=ON \ |
21 | -DPTSEG=ON \ | ||
21 | -DCMAKE_SKIP_RPATH=ON \ | 22 | -DCMAKE_SKIP_RPATH=ON \ |
22 | " | 23 | " |
23 | 24 | ||
@@ -26,7 +27,7 @@ do_install:append() { | |||
26 | install -d ${D}${bindir}/libipt/tests | 27 | install -d ${D}${bindir}/libipt/tests |
27 | 28 | ||
28 | cp -r ${B}/bin/* ${D}${bindir}/libipt/ | 29 | cp -r ${B}/bin/* ${D}${bindir}/libipt/ |
29 | cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests | 30 | cp -r ${S}/test/src/* ${D}${bindir}/libipt/tests |
30 | } | 31 | } |
31 | 32 | ||
32 | FILES:${PN}-test = "${bindir}" | 33 | FILES:${PN}-test = "${bindir}" |
diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb index a45a3dea..5a9f5b4d 100644 --- a/recipes-support/sbsigntool/sbsigntool-native_git.bb +++ b/recipes-support/sbsigntool/sbsigntool-native_git.bb | |||
@@ -22,16 +22,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=9eef91148a9b14ec7f9df333daebc746 \ | |||
22 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \ | 22 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \ |
23 | git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \ | 23 | git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \ |
24 | file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \ | 24 | file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \ |
25 | file://0002-fix-openssl-3-0.patch \ | 25 | " |
26 | " | ||
27 | 26 | ||
28 | SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826" | 27 | SRCREV_sbsigntools ?= "9cfca9fe7aa7a8e29b92fe33ce8433e212c9a8ba" |
29 | SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" | 28 | SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" |
30 | SRCREV_FORMAT = "sbsigntools_ccan" | 29 | SRCREV_FORMAT = "sbsigntools_ccan" |
31 | 30 | ||
32 | DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native" | 31 | DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native" |
33 | 32 | ||
34 | PV = "0.9.4-git${SRCPV}" | 33 | PV = "0.9.5" |
35 | 34 | ||
36 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |
37 | 36 | ||
diff --git a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch b/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch index ef686511..ea7bee29 100644 --- a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch +++ b/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch | |||
@@ -10,7 +10,7 @@ under /usr/include and /usr/lib. | |||
10 | Prepend these paths with a placeholder that can be replaced with the | 10 | Prepend these paths with a placeholder that can be replaced with the |
11 | actual paths once they are resolved. | 11 | actual paths once they are resolved. |
12 | 12 | ||
13 | Upstream status: inappropriate [OE specific] | 13 | Upstream-Status: Inappropriate [OE specific] |
14 | 14 | ||
15 | Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 15 | Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
16 | 16 | ||
diff --git a/recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch b/recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch deleted file mode 100644 index 8a277947..00000000 --- a/recipes-support/sbsigntool/sbsigntool/0002-fix-openssl-3-0.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Use ASN1_ITEM_rptr() instead of taking the address of IDC_PEID_it. | ||
2 | |||
3 | openssl-3.0 changed the type of TYPE_it from `const ASN1_ITEM TYPE_it` to | ||
4 | `const ASN1_ITEM *TYPE_it(void)`. This was previously hidden behind | ||
5 | OPENSSL_EXPORT_VAR_AS_FUNCTION but in 3.0 only the function version is | ||
6 | available. This change should have been transparent to the application, but | ||
7 | only if the `ASN1_ITEM_rptr()` macro is used. | ||
8 | |||
9 | This change passes `make check` with both openssl 1.1 and 3.0. | ||
10 | |||
11 | Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com> | ||
12 | Upstream-status: Submited [https://groups.io/g/sbsigntools/topic/patch_fix_openssl_3_0_issue/85903418] | ||
13 | --- | ||
14 | src/idc.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/idc.c b/src/idc.c | ||
18 | index 6d87bd4..0a82218 100644 | ||
19 | --- a/src/idc.c | ||
20 | +++ b/src/idc.c | ||
21 | @@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image) | ||
22 | |||
23 | idc->data->type = OBJ_nid2obj(peid_nid); | ||
24 | idc->data->value = ASN1_TYPE_new(); | ||
25 | - type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it); | ||
26 | + type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID)); | ||
27 | |||
28 | idc->digest->alg->parameter = ASN1_TYPE_new(); | ||
29 | idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256); | ||
30 | -- | ||
31 | 2.25.1 | ||
32 | |||