Internal feature

Change-Id: I05b8699b7d4e069b0cd264ff6c0c0ac4edaca02f
intel · Nov 1, 2018 · 3c8da04 · 3c8da04
1 parent 66de115
commit 3c8da04
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/visa/iga/IGALibrary/Frontend/KernelParser.cpp b/visa/iga/IGALibrary/Frontend/KernelParser.cpp
@@ -760,8 +760,8 @@ bool GenParser::TryParseInstOptOrDepInfo(InstOptSet &instOpts)
 bool GenParser::tryParseInstOptDepInfoToken(InstOptSet &instOpts)
 {
     auto loc = NextLoc();
-    InstOpt newOpt = InstOpt::ACCWREN;
     if (LookingAt(IDENT)) {
+        InstOpt newOpt = InstOpt::ACCWREN;
         // classic instruction option that affects instruction dependency
         // scheduling etc...
         if (ConsumeIdentEq("NoDDChk")) {
@@ -2975,7 +2975,9 @@ Kernel *iga::ParseGenKernel(
     const ParseOpts &popts)
 {
     Kernel *k = new Kernel(m);
+
     InstBuilder h(k, e);
+
     KernelParser p(m, h, inp, e, popts);
     try {
         p.ParseListing();

diff --git a/visa/iga/IGALibrary/IR/InstBuilder.hpp b/visa/iga/IGALibrary/IR/InstBuilder.hpp
@@ -166,6 +166,7 @@ class InstBuilder {
 
 
 
+
     void clearInstState() {
         m_predication.function = PredCtrl::NONE;
         m_predication.inverse = false;
@@ -263,6 +264,7 @@ class InstBuilder {
         } // else: targets end of program exactly
     }
 
+
 public:
     InstBuilder(Kernel *kernel, ErrorHandler &e)
         : m_model(kernel->getModel())
@@ -274,6 +276,7 @@ class InstBuilder {
 
     ErrorHandler &errorHandler() {return m_errorHandler;}
 
+
     // Called at the beginning of the program
     void ProgramStart() {
         m_pc = 0;

diff --git a/visa/iga/IGALibrary/api/igaEncoderWrapper.cpp b/visa/iga/IGALibrary/api/igaEncoderWrapper.cpp
@@ -8,8 +8,12 @@ iga_status_t KernelEncoder::encode()
 {
 
     ErrorHandler errHandler;
-    Encoder enc(kernel->getModel(),
-        errHandler, EncoderOpts(autoCompact, true, nocompactFirstEightInst));
+    Encoder enc(kernel->getModel(), errHandler,
+                EncoderOpts(autoCompact,
+                            true,
+                            nocompactFirstEightInst,
+                            false
+                ));
     enc.encodeKernel(
         *kernel,
         kernel->getMemManager(),
@@ -73,4 +77,4 @@ bool KernelEncoder::patchImmValue(const Model& model, unsigned char* binary, Typ
         return false;
 
     return true;
-}
+}
diff --git a/visa/iga/IGALibrary/api/igaEncoderWrapper.hpp b/visa/iga/IGALibrary/api/igaEncoderWrapper.hpp
@@ -33,4 +33,5 @@ class KernelEncoder
     // This function is used by visa to patch the add or mov instructions' imm field for the indirect call
     // FIXME: Move this api to somewhere else that's more apporopriate
     static bool patchImmValue(const iga::Model& model, unsigned char* binary, iga::Type type, const iga::ImmVal &val);
+
 };