Commit Graph

60 Commits

Author SHA1 Message Date
Artur Harasimiuk 3d43fe6c97 set required version of igc-opencl package
Change-Id: I7b2194bd7c396082a70c4eeff4d78ee74b752258
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-06-22 10:50:54 +02:00
Artur Harasimiuk fee08985dc properly handle includes when IGC__IGC_TARGETS is defined
Change-Id: I518a33ae97950467965126e55bc93e644e439934
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-06-22 09:19:29 +02:00
Mateusz Jablonski b659d270ae Revert "Create wrapper for GmmClientContext"
This reverts commit 50c31872d8.

Change-Id: Id154ca2d217e5e45623750f641ebad5dc5e840a2
2018-06-21 16:14:45 +02:00
Artur Harasimiuk 6540a9c96b do not generate igc.config.h when igc-opencl package was found
this file will be provided by IGC development package when present. We
should generate it only for other cases

Change-Id: Ic11f8c74e4f0a4575b654d0afdfa7336e1fdc7d6
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-06-21 12:27:51 +02:00
Mateusz Jablonski 50c31872d8 Create wrapper for GmmClientContext
reduce mock gmm to implementation of OpenGmm function

Change-Id: I657412af2d11486c9924cf3ab9a8b4f51e603964
2018-06-21 10:17:46 +02:00
Artur Harasimiuk bc2403acfd allow IGC to be discovered by pkg-config
New detection flow:
1. check for IGC__IGC_TARGETS and respect if defined -> IGC available
2. on Linux try using pkg-config to find IGC
   - package can be part of workspace, in this case we have to tweak
     some variables
3. check whether igc folder contains CMakeLists.txt and do
   add_subdirectory if yes.
4. IGC not available -> fail

other changes:
- rename compiler.config to match name from IGC devel package

Change-Id: I6c2369f8b83db66327d76c9b08af833736e8a3f9
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-06-20 13:13:58 +02:00
Artur Harasimiuk a203b0c32e add opencl headers to third party
Change-Id: I8a1a7c3b371ca3aa118d3e4a7e989b0f6c08f374
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-06-19 13:33:22 +02:00
Mateusz Jablonski cc9e5a7943 Restore using compiler.config.h
define source level debugger dll name when it has empty implementation

Change-Id: I2a0938c8418da161f214735644f00f7873540f75
2018-06-12 17:02:51 +02:00
Mateusz Jablonski 5007c60a03 Generate dll names to lib_names.h
Remove some not needed ifdef blocks

Change-Id: I29f787bde819a2f19312dd5713df0d4534a47cd8
2018-06-11 18:00:56 +02:00
Mateusz Jablonski 98b8b4b6a4 Prepare to use gmm as dll on Windows
Since this commit neo on Windows can use static or shared gmm lib

Change-Id: I7db70d7f9bc969e8193ac77e8b6d65ecc57d0093
2018-06-08 17:35:01 +02:00
Artur Harasimiuk 1e045e3e76 don't force IGC shared library name when building full-source
We respect library name passed from IGC cmakes

Change-Id: I030f0b473b51e6522613a19e00d84d0f2b254daa
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-05-30 15:45:27 +02:00
Artur Harasimiuk 6abcc4a2a9 allow to build Neo with most recent version of Khronos headers
The structure of https://github.com/KhronosGroup/OpenCL-Headers.git has
changed recently and we have to adjust to new layout.
New flow is:
1. try old layout with opencl21 folder in repo, continue compilation
   if successful
2. try with new layout

Change-Id: Ia8c3eb76655aeef70512e9a03d74c72ba776fd4f
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-05-17 11:21:32 +02:00
Artur Harasimiuk 10e5b71111 dependencies cleanup
move gmock/gtest to third party

Change-Id: I96b43a3de2b6f2151659a9b2eed27eb58db5ce48
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-05-11 15:04:45 +02:00
Dunajski, Bartosz 7ddc571a11 Add build directory path for configured driver_version header
Change-Id: Ic092c2156b158377dc00c5c754827515ee2d290b
2018-04-27 10:17:05 +02:00
Dunajski, Bartosz d71b46bdae Use configure_file for NEO_DRIVER_VERSION instead of source file property
Change-Id: I76888a7eb2a2c6e228306b5c740c55c6abff93da
2018-04-27 10:13:28 +02:00
Dunajski, Bartosz 82c9acddde Improve including common reg_configs header
Change-Id: I7fa22c2caffd0004269eb0d4f4fcdfd7621572af
2018-04-26 14:48:50 +02:00
Artur Harasimiuk 5fbdad88c6 refactor config.h usage
- add defines to command line
- remove most occurences of include "config.h"

Change-Id: I19d65d83c895fc6143d319d057a50e5ae3e78830
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-04-26 10:02:15 +02:00
Hoppe, Mateusz efda64eb4a Source Level Debugger - debugger library interface
- interface to debugger dynamic library
- code is included when source level debugger header exists,
otherwise implementation is exluded from build
- unit tests do not load real dynamic library,
instead test version (DebbugerLibrary) of OsLibrary is used.

Change-Id: Id3229c77963352e8001043ee41b7d48c6b180a59
2018-04-23 11:31:37 +02:00
Artur Harasimiuk 12843c5eba use externally provided names of compiler shared libraries
Intel Graphics Compiler is preparing change to unify compiler naming.
They will expose two variables which we should use when loading compiler
libraries.

Change-Id: If6edcb7541452b3cd429a8b4f7c26f6d43169035
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2018-04-17 12:07:58 +02:00
Jacek Danecki 1504d89571 switch to libva 2.x
- support for libva 1.x has been dropped

Change-Id: Ie5361b98cdd36144c9cd2a413c5fc2871655f333
2018-04-13 11:16:33 +02:00
Jacek Danecki a8597ac162 remove dependency on librt
- clock_gettime is provided by glibc

Change-Id: Ic76c272d31581538ef4c2ad7adc22f836437c642
2018-03-29 23:51:00 +02:00
Artur Harasimiuk 9f5f0f64cb Revert "use externally provided names of compiler shared libraries"
This reverts commit 73e6846cda.

Change-Id: I2b39bb5b3186f14f1077c06adca8db242abf1e6b
2018-03-28 13:10:06 +02:00
Artur Harasimiuk 73e6846cda use externally provided names of compiler shared libraries
Intel Graphics Compiler is preparing change to unify compiler naming.
They will expose two variables which we should use when loading compiler
libraries.

Change-Id: I49ea2ce9f4bb705ccd3fb8d2b19c61c0622e6c09
2018-03-28 10:35:53 +02:00
Artur Harasimiuk b93a208886 build system improvements
Change-Id: I7f43535f01638f9aef1b7b80a01d10b74cc8e0fd
2018-03-22 17:35:32 +01:00
Filipkowski, Lukasz 9ce3a10248 Set custom build types for multi-configuration generators
Change-Id: Iae3fd3422a3b128a29ca11dab30c87dd546e05ab
2018-03-22 11:53:04 +01:00
Filipkowski, Lukasz c4c75e542e Set CMAKE_CONFIGURATION_TYPES only for MSBuild
Change-Id: I03edd2aef10d8aa6479f9209c67464658732c34a
2018-03-21 15:48:31 +01:00
Artur Harasimiuk 507544a999 add i915 uapi headers
Change-Id: I8b19ebc56c5aa394758177641b2946f7fca13eff
2018-03-16 17:30:48 +01:00
Mateusz Jablonski e21e220540 Cmake refactor part 16
igdrcl_tests: define gen specific sources in subdirectories
libult: append gen specific sources needed to link hw tests

Change-Id: I72505729f1ff27439cd43904688de9c2cfbe080f
2018-03-16 14:07:37 +01:00
Artur Harasimiuk dede44f0dd cmake refactor to allow sub components to use the same settings
Change-Id: I7e8a1e51d27406e0a8f1eeb227374c2f938f028b
2018-03-15 09:30:58 +01:00
Artur Harasimiuk 6674e93b69 further cleanup on ARTIFACTS_DIR
Change-Id: Iec2a5fed2e1626300425c09574a388806d4746e1
2018-03-09 08:37:11 +01:00
Mateusz Jablonski 8c8b47026d Cmake refactor part 13
Cleanup offline_compiler/CMakeLists.txt
Cleanup unit_tests/offline_compiler/CMakeLists.txt

Change-Id: I1f4a2384ca64abd068b30a33ec643fa294ebaae3
2018-03-08 21:39:34 +01:00
Artur Harasimiuk 50e17af9aa cmake: remove support for building icd as a part of our workspace
ICD is external component and is expected to be installed in OS. No need
to build it

Change-Id: Ibd9fda204e296d46a25133a7a512a786c3643809
2018-03-08 17:40:38 +01:00
Artur Harasimiuk a93154db1b remove ARTIFACTS_DIR support
not used anymore

Change-Id: I05adf3d0ac60ac425758df1480709d2e85076669
2018-03-05 21:49:00 +01:00
Artur Harasimiuk e6a956d7c9 update method to find Instrumentation library
search order is:
1. check if variable INSTRUMENTATION_LIB_NAME is set. if yes it will
provide lib name and target have to be present
2. check if source location was given. use it if yes
3. check if folder in workspace exists

When library is found then dependency is added to ensure build order
When none of above found support in Neo will be disabled (stub is used)

Change-Id: I9151f4002997ab5cfd1a397794f11cc18dfe44fa
2018-03-02 08:12:02 +01:00
Mateusz Jablonski d1aa5f978d Cmake refactor part 6
Add macro to add all subdirectories
Add macro to create project source tree based on target sources
Small cleanup runtime/CMakeLists.txt

Change-Id: I9b99145c544f648c4c3fe7421752d0c5d9504edf
2018-03-02 00:39:41 +01:00
Mateusz Jablonski f407cdeada Add cmake flag to force using response file in ninja
Change-Id: I13179ba6df2f5d8351e878c7a6ef59100deafffe
2018-03-01 11:53:22 +01:00
Artur Harasimiuk 3706e6285d detect WDK prior to subcomponent inclusion
some of our dependencies require WDK to work. by setting WDK_DIR and
WDK_VERSION variables we advertise this to them

Change-Id: I2a46d9e30ca3ca60acd2bc76f75c4dac34a143f8
2018-02-28 22:41:37 +01:00
Artur Harasimiuk 4636367d55 update method to find Intel Graphics Compiler
search order is:
1. check variable IGC__IGC_TARGETS. if set it provides a list of targets
required to get compiler stack
2. check for variable IGC_DIR. if set include such folder
3. check if gmmlib folder exists in workspace. if yes, then include this
folder

When including folder (2 & 3), it is expected that IGC__IGC_TARGETS
variable will be exposed

Change-Id: I853606971a6b8d094ae13f7681857fe7717b9cd3
2018-02-26 13:59:19 +01:00
Artur Harasimiuk be0150a563 WUD is default for Neo@Windows
There is no need to have this macro and execute it twice

Change-Id: I3756913d2dbba100bb173771d085c609e4509e69
2018-02-26 09:06:48 +01:00
Artur Harasimiuk 2e5e1ac0fb update method to find GmmLib
search order is:
1. check variable GMMUMD_LIB_NAME. if set target of this name should
exist
2. check for variable GMM_SOURCE_DIR. if set include such folder and
check GMMUMD_LIB_NAME for library name assumig 'gmm_umd' as default
3. check if gmmlib folder exists in workspace. if yes, then include it
and check GMMUMD_LIB_NAME for library name assuming 'gmm_umd' as default

Change-Id: I9f5f69ab97c0bb8f2c250ac91b69c3ccd048fdda
2018-02-26 09:05:52 +01:00
Zdunowski, Piotr e3268f8a9c Revert "Allow custom props settings."
This reverts commit f43a04d3b2.

Change-Id: Ib4cd854c19fe96b0ea9d5e3782d1247c265927c9
2018-02-23 16:01:31 +01:00
Zdunowski, Piotr f43a04d3b2 Allow custom props settings.
Change-Id: Idd442f429e8f413cde67781995e0c1b1c010bcee
2018-02-21 12:16:35 +01:00
Artur Harasimiuk 56b34ee49f properly set default value of CMAKE_BUILD_TYPE
Simple set() is not enough because this variable is created with empty
value after cmake starts. We have to force setting value and store in
cache.

Change-Id: I0d018ebe3a9a0a65f6fae5313853857913d84bf7
2018-02-14 08:15:33 +01:00
Artur Harasimiuk 333af8349e fix instrumentation handling in cmake
some set() statements were constructed incorrectly. we shouldn't
dereference variable when setting its value

Change-Id: Idc9d60fa87a4364f2b2583d21d53cc0b6f5560d9
2018-02-12 17:30:49 +01:00
Artur Harasimiuk cece633e93 cmake: refactor WDK_DIR detection
- Win15 sub folder is optional
- added cmake variable to define WDK Version to use

Change-Id: I9618eaa72e160834544b304c47ea6d17766d6966
2018-02-08 11:38:11 +01:00
Mateusz Jablonski 0178b9862f Cmake refactor part 3:
Move defining genX sources logic to separated cmake file
Fix defining hw src include path

Change-Id: Id89125ab6f461fbcf5162157f76e0fbe0544fa69
2018-02-08 09:23:37 +01:00
Artur Harasimiuk 043ad0eeba fix PDB generation
we want them for all supported build types

Change-Id: I97f4e860601eec10d2c9058bd9e0aecf68475f45
2018-02-08 07:51:33 +01:00
Milczarek, Slawomir 12b437ddc8 Add DAF headers to manifest.yml and redefined headers search path in cmake
Change-Id: I8d399aa717d8274da3892c3229e6502ef601864b
2018-02-07 17:12:17 +01:00
Milczarek, Slawomir 89be67b570 Add support for DAF injection
This commit adds support for Debug Assistance Functionality (DAF)
aka "Driver Aubcapture" to debug builds on Windows.

Change-Id: I7e859d32af17a6fcee23868392df6cd1390e4afd
2018-02-05 16:08:52 +01:00
Mateusz Jablonski b027a82442 Cmake refactor part 2:
Move defining runtime sources into cmake files in subdirectories

Change-Id: Ic83c12fee65e04d19e7c8e1f88b939f03af7fa28
2018-02-05 13:40:46 +00:00