Add beignet and other OpenCL components. #24

ipuustin · 2017-02-15T16:28:27Z

Integrate beignet + other OpenCL components into refkit. This enables various components to be hw-accelerated. One component that can be used out-of-box with OpenCL is OpenCV.

mythi · 2017-02-16T10:57:09Z

meta-refkit/recipes-opencl/packagegroups/packagegroup-opencl.bb

@@ -0,0 +1,9 @@
+SUMMARY = "OpenCL for Ostro OS XT"


some leftovers here

Fixed now...

mythi · 2017-02-16T10:59:40Z

.gitmodules

 	url = https://github.com/IntelRealSense/meta-intel-realsense.git
+[submodule "meta-clang"]
+	path = meta-clang
+	url = https://github.com/kraj/meta-clang.git


can you add this with -b krogoth

I added branch = krogoth, I guess that's what you meant?

mythi · 2017-02-16T15:23:25Z

meta-refkit/conf/bblayers.conf.sample

  ##OEROOT##/../meta-iotqa \
  ##OEROOT##/../meta-security-isafw \
  ##OEROOT##/../meta-intel-realsense \
+  ##OEROOT##/../meta-clang \


a learning from meta-intel-realsense addition: we need to update the LCONF_VERSION and LAYER_CONF_VERSION too

Hmm, do you mean that we need to bump up LCONF_VERSION to 2 in bblayers.conf.sample?

Yes and also LAYER_CONF_VERSION in layer.conf. This ensures that users update their build/conf/bblayers.conf before bitbake parses the recipes with these changes included. The recipe parsing fails with an error because this PR brings a bbappend but the corresponding bb is in meta-clang (which is unlikely enabled unless we force it with the conf version change).

ipuustin · 2017-02-21T11:05:27Z

@skuusela : could you check that the test is done correctly, please?

skuusela · 2017-02-21T13:37:30Z

@ipuustin The test seem to run fine:
test_opencl_viennacl_1 (oeqa.runtime.computervision.opencl_viennacl_1.OpenCLViennaCL1Test) ... OK (25.392s)

ipuustin · 2017-02-21T13:50:16Z

@skuusela: Good!

mythi · 2017-02-21T20:00:24Z

meta-refkit/recipes-opencl/opencv/opencv_%.bbappend

@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = " \


is this opencv_%.bbappend intentionally separate from the other you're adding above?

Good catch! Consolidated the bbappends.

mythi · 2017-02-22T09:56:59Z

test this please

ipuustin · 2017-02-22T12:09:17Z

Rebased.

mythi · 2017-02-22T12:29:01Z

@ipuustin this needs rebasing after #35

Add meta-clang (krogoth branch). Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Make the correct gcc toolchain available for clang. This is backported from meta-clang master. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Use the recipes-opencl from Ostro XT in unmodified form. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Also update the native build cleanup patch. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

This is backwards, since the OpenCL ICD shouldn't depend on the ICD loader. However, if beignet doesn't recognize ocl-icd, it doesn't export the correct symbols required by ocl-icd. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Some packages (opencv) depend on virtual/opencl-icd. Since ocl-icd provides an icd, indicate that in PROVIDES. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Updated version from 2.2.9 to 2.2.11. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Add packagegroup-opencl to packagegroup-computervision and also to supported recipes. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Adjust opencv PACKAGECONFIG so that OpenCL support gets enabled. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Do not depend on opencl-headers (which is a name of a recipe), but rather on virtual/opencl-headers, which are supplied by several providers. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

ViennaCL is OpenCL-accelerated linear algebra library. The sample files and benchmarks can be used for testing OpenCL functionality and performance. Add viennacl-examples to packagegroup-computervision-test. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Beignet needs to know compile-time which PCI ID contains the OpenCL device. This PCI id is different on different HW targets. Build an OpenCL ICD for each HW target. Only mark platform available if the driver matches the target hardware. This enables us to have multiple beignet backends, of which only the correct one gets loaded. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

Run a ViennaCL OpenCL benchmark. This should test beignet, kernel driver, ocl-icd, and ViennaCL. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

The default behavior is to load the OpenCL library dynamically. OpenCV attempts to use /usr/lib/libOpenCL.so, which is a symlink provided only by ocl-icd-dev package. By really linking against the OpenCL library, OpenCL works without manually having to add the symlink or installing the ocl-icd-dev package. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

ipuustin · 2017-02-22T13:58:45Z

Rebased again.

packagegroup-nodejs-runtime.bb: remove soletta Node.js bindings

ipuustin added the test-build label Feb 15, 2017

ipuustin force-pushed the beignet branch 3 times, most recently from ae1e5a6 to ce428e5 Compare February 15, 2017 19:49

mythi reviewed Feb 16, 2017

View reviewed changes

ipuustin force-pushed the beignet branch 2 times, most recently from 1cc5fc5 to cc949cd Compare February 16, 2017 15:15

mythi reviewed Feb 16, 2017

View reviewed changes

ipuustin force-pushed the beignet branch 8 times, most recently from 30e6468 to 88be5f0 Compare February 21, 2017 11:04

ipuustin changed the title ~~Beignet TEST BUILD, do not merge!~~ Add beignet and other OpenCL components. Feb 21, 2017

ipuustin force-pushed the beignet branch 2 times, most recently from da0e2f2 to d2dda42 Compare February 21, 2017 12:48

ipuustin removed the test-build label Feb 21, 2017

mythi reviewed Feb 21, 2017

View reviewed changes

ipuustin force-pushed the beignet branch from b93f24c to 863cc0e Compare February 22, 2017 08:03

ipuustin force-pushed the beignet branch from 863cc0e to 56f63ae Compare February 22, 2017 12:07

ipuustin added 14 commits February 22, 2017 15:48

meta-clang: add new layer.

7becffc

Add meta-clang (krogoth branch). Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

clang: fix toolchain.

cc68214

Make the correct gcc toolchain available for clang. This is backported from meta-clang master. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

meta-refkit: import recipes-opencl from Ostro XT.

11cdcea

Use the recipes-opencl from Ostro XT in unmodified form. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

beignet: update to version 1.3.0.

b0e7d1e

Also update the native build cleanup patch. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

beignet: depend on ocl-icd.

bbf771a

This is backwards, since the OpenCL ICD shouldn't depend on the ICD loader. However, if beignet doesn't recognize ocl-icd, it doesn't export the correct symbols required by ocl-icd. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

ocl-icd: provide virtual/opencl-icd.

7e4c2a9

Some packages (opencv) depend on virtual/opencl-icd. Since ocl-icd provides an icd, indicate that in PROVIDES. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

ocl-icd: updated version.

0e15d35

Updated version from 2.2.9 to 2.2.11. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

packagegroup-computervision: add OpenCL components.

4fb9030

Add packagegroup-opencl to packagegroup-computervision and also to supported recipes. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

refkit.conf: OpenCL support for opencv.

b603b89

Adjust opencv PACKAGECONFIG so that OpenCL support gets enabled. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

opencv: depend rather on virtual/opencl-headers.

40d630c

Do not depend on opencl-headers (which is a name of a recipe), but rather on virtual/opencl-headers, which are supplied by several providers. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

tests: simple OpenCL sanity test.

bfe6233

Run a ViennaCL OpenCL benchmark. This should test beignet, kernel driver, ocl-icd, and ViennaCL. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>

ipuustin force-pushed the beignet branch from 56f63ae to ce8599f Compare February 22, 2017 13:58

mythi merged commit eaaab9a into intel:master Feb 22, 2017

pohly pushed a commit to pohly/intel-iot-refkit that referenced this pull request Apr 26, 2017

Merge pull request intel#24 from nagineni/update_packagegroups

ce60847

packagegroup-nodejs-runtime.bb: remove soletta Node.js bindings

		@@ -0,0 +1,5 @@
		FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

		SRC_URI_append = " \

Add beignet and other OpenCL components. #24

Add beignet and other OpenCL components. #24

Uh oh!

Conversation

ipuustin commented Feb 15, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ipuustin commented Feb 21, 2017

Uh oh!

skuusela commented Feb 21, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ipuustin commented Feb 21, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mythi commented Feb 22, 2017

Uh oh!

ipuustin commented Feb 22, 2017

Uh oh!

mythi commented Feb 22, 2017

Uh oh!

ipuustin commented Feb 22, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ipuustin commented Feb 15, 2017 •

edited

Loading

skuusela commented Feb 21, 2017 •

edited

Loading