Refactor

Change-Id: I4f0eb839f31f062ea9ed6e39cd1ad8f93eaeca10

Author: FilipFudala

IGC/AdaptorCommon/API/igc.h

@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <string>
+#include "../../common/EmUtils.h"
 #include "../IGC/Compiler/CodeGenPublicEnums.h"
 // TODO: add all external declarations so that external projects only need
 // to include this file only.

IGC/Compiler/CodeGenPublicEnums.h

@@ -28,6 +28,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
+#include "../IGC/common/EmUtils.h"
+
 namespace IGC
 {
     enum HullShaderDispatchModes : signed int

IGC/GenISAIntrinsics/GenIntrinsicInst.h

@@ -57,6 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "llvm/IR/Module.h"
 #include "common/LLVMWarningsPop.hpp"
 #include "Compiler/CodeGenPublicEnums.h"
+#include "common/EmUtils.h"
 #include "common/Types.hpp"
 #include "GenIntrinsics.h"
 #include "Probe/Assertion.h"

IGC/LLVM3DBuilder/BuiltinsFrontend.hpp

@@ -39,6 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "inc/common/Compiler/API/SurfaceFormats.h"
 #include "inc/common/igfxfmid.h"
 #include "common/IGCIRBuilder.h"
+#include "../common/EmUtils.h"
 
 struct genplatform
 {

IGC/Probe/Assertion.h

@@ -27,6 +27,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef IGC_PROBE_ASSERTION_H
 #define IGC_PROBE_ASSERTION_H
 
+#include "../common/EmUtils.h"
+
 
 #include <cassert>
 #include <cstdlib>

IGC/common/EmUtils.h

@@ -0,0 +1,26 @@
+/*===================== begin_copyright_notice ==================================
+
+Copyright (c) 2017 Intel Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+======================= end_copyright_notice ==================================*/
+

IGC/common/Types.hpp

@@ -42,6 +42,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "IGC/common/LLVMWarningsPop.hpp"
 #include "Probe/Assertion.h"
 #include "IGC/common/shaderHash.hpp"
+#include "EmUtils.h"
+
 namespace USC
 {
     struct ShaderD3D;

IGC/common/igc_regkeys.def

@@ -24,6 +24,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ======================= end_copyright_notice ==================================*/
 
+#include "common/EmUtils.h"
+
 #ifndef DECLARE_IGC_GROUP
 #define DECLARE_IGC_GROUP(groupName)
 #endif