Cmake refactor part 1: fix dependencies with including os_inc.h

Remove some not needed includes

Change-Id: I158ad663ccfcec4822e3768df9d05090c5e096f9

runtime/os_interface/linux/drm_command_stream.inl

@@ -169,7 +169,7 @@ MemoryManager *DrmCommandStreamReceiver<GfxFamily>::createMemoryManager(bool ena
 template <typename GfxFamily>
 bool DrmCommandStreamReceiver<GfxFamily>::waitForFlushStamp(FlushStamp &flushStamp) {
     drm_i915_gem_wait wait = {};
-    wait.bo_handle = flushStamp;
+    wait.bo_handle = static_cast<uint32_t>(flushStamp);
     wait.timeout_ns = -1;
 
     drm->ioctl(DRM_IOCTL_I915_GEM_WAIT, &wait);

runtime/os_interface/linux/drm_neo.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "drm_neo.h"
-#include "runtime/os_interface/os_inc.h"
+#include "runtime/os_interface/os_inc_base.h"
 #include "runtime/utilities/directory.h"
 #include "drm/i915_drm.h"
 

runtime/os_interface/linux/linux_inc.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "runtime/os_interface/linux/linux_inc.h"
+#include "runtime/os_interface/linux/os_inc.h"
 #include "runtime/utilities/perf_profiler.h"
 namespace Os {
 const char *fileSeparator = "/";

runtime/os_interface/linux/os_inc.h

@@ -22,19 +22,9 @@
 
 #pragma once
 
-// For now we need to keep this file clean of OS specific #includes.
-// Only issues to address portability should be covered here.
-
-#if defined(__linux__)
-#include <cstdint>
-
 #define PATH_SEPARATOR '/'
-
 #define __cdecl
 namespace OCLRT {
 class PerfProfiler;
-typedef int FlushStamp; // i915 gem object handle
 extern thread_local PerfProfiler *gPerfProfiler;
 };
-
-#endif

runtime/os_interface/linux/os_library.cpp

@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#if defined(__linux__)
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_library.h"
 #include "os_library.h"
@@ -66,4 +65,3 @@ void *OsLibrary::getProcAddress(const std::string &procName) {
 }
 }
 }
-#endif

runtime/os_interface/os_inc_base.h

@@ -21,9 +21,6 @@
  */
 
 #pragma once
-
-#include "runtime/os_interface/linux/linux_inc.h"
-#include "runtime/os_interface/windows/windows_inc.h"
 #include "runtime/os_interface/os_library.h"
 
 namespace Os {

runtime/os_interface/windows/gdi_interface.h

@@ -22,7 +22,7 @@
 
 #pragma once
 #include "runtime/helpers/options.h"
-#include "runtime/os_interface/windows/windows_inc.h"
+#include "runtime/os_interface/windows/os_inc.h"
 #include "runtime/os_interface/windows/os_library.h"
 #include <d3d9types.h>
 #include <d3dkmthk.h>

runtime/os_interface/windows/os_inc.h

@@ -21,12 +21,10 @@
  */
 
 #pragma once
-#if defined(_WIN32)
 #define PATH_SEPARATOR '\\'
 
 namespace OCLRT {
 class PerfProfiler;
-typedef unsigned long long FlushStamp; // monitored fence value
 extern __declspec(thread) PerfProfiler *gPerfProfiler;
 };
 // For now we need to keep this file clean of OS specific #includes.
@@ -36,5 +34,3 @@ namespace Os {
 // OS GDI name
 extern const char *gdiDllName;
 };
-
-#endif // _WIN32

runtime/os_interface/windows/windows_inc.cpp

@@ -20,7 +20,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "runtime/os_interface/windows/windows_inc.h"
 #include "runtime/utilities/perf_profiler.h"
 namespace Os {
 const char *fileSeparator = "/";