Commit 86031647 authored by Diana Chen's avatar Diana Chen Committed by gbsbuild

IGA: refine send comments, always print the src0 and src1 length

Change-Id: Ib9000bafbfdd275c38ccca6f19fcf392ce2f1949
parent 81d46788
...@@ -12,6 +12,9 @@ include (BuildFunctions.cmake) ...@@ -12,6 +12,9 @@ include (BuildFunctions.cmake)
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 11)
# do static build for IGA standalone build
set(LINK_AS_STATIC_LIB TRUE)
set(GED_BRANCH GED_external) set(GED_BRANCH GED_external)
add_subdirectory(GEDLibrary/${GED_BRANCH}) add_subdirectory(GEDLibrary/${GED_BRANCH})
......
...@@ -1430,17 +1430,22 @@ void Formatter::EmitSendDescriptorInfoGED( ...@@ -1430,17 +1430,22 @@ void Formatter::EmitSendDescriptorInfoGED(
ss << "h"; ss << "h";
} }
if (os.isSendsFamily()) { // emit src1 length
if (has_ged_inst) { uint32_t src1_len = 0;
uint32_t exLength = GED_GetExMsgLength(&gedInst, &getRetVal); bool has_src1_len = false;
if (getRetVal != GED_RETURN_VALUE_SUCCESS) { if (os.isSendsFamily() && has_ged_inst) {
// in the case that we're able to construct ged inst, the src1_len = GED_GetExMsgLength(&gedInst, &getRetVal);
// ex_dess must be imm if (getRetVal != GED_RETURN_VALUE_SUCCESS) {
exLength = getSplitSendMsgLength(ex_desc.imm); // in the case that we're able to construct ged inst, the
} // ex_desc must be imm
ss << "+" << exLength; src1_len = getSplitSendMsgLength(ex_desc.imm);
} }
has_src1_len = true;
} }
if (has_src1_len)
ss << "+" << src1_len;
else
ss << "+?";
uint32_t respLength = GED_GetResponseLength(desc, gedP, &getRetVal); uint32_t respLength = GED_GetResponseLength(desc, gedP, &getRetVal);
if (getRetVal != GED_RETURN_VALUE_SUCCESS) { if (getRetVal != GED_RETURN_VALUE_SUCCESS) {
...@@ -1578,8 +1583,8 @@ void Formatter::EmitSendDescriptorInfoGED( ...@@ -1578,8 +1583,8 @@ void Formatter::EmitSendDescriptorInfoGED(
switch (getScratchSpaceGRFsSize(desc)) { switch (getScratchSpaceGRFsSize(desc)) {
case 0: ss << "1grf"; break; case 0: ss << "1grf"; break;
case 1: ss << "2grfs"; break; case 1: ss << "2grfs"; break;
case 2: ss << "?grfs"; break; case 2: ss << "4grfs"; break;
case 3: ss << "4grfs"; break; case 3: ss << "8grfs"; break;
} }
uint32_t off = getScratchSpaceAddressOffset(desc); uint32_t off = getScratchSpaceAddressOffset(desc);
ss << " from 0x" << std::hex << off << ")"; ss << " from 0x" << std::hex << off << ")";
...@@ -1603,8 +1608,6 @@ void Formatter::EmitSendDescriptorInfoGED( ...@@ -1603,8 +1608,6 @@ void Formatter::EmitSendDescriptorInfoGED(
ss << "#" << surf; ss << "#" << surf;
} }
} }
return; return;
} }
...@@ -1728,8 +1731,8 @@ void Formatter::EmitSendDescriptorInfo( ...@@ -1728,8 +1731,8 @@ void Formatter::EmitSendDescriptorInfo(
switch (getBitField(desc, 12, 2)) { switch (getBitField(desc, 12, 2)) {
case 0: ss << "1grf"; break; case 0: ss << "1grf"; break;
case 1: ss << "2grfs"; break; case 1: ss << "2grfs"; break;
case 2: ss << "?grfs"; break; case 2: ss << "4grfs"; break;
case 3: ss << "4grfs"; break; case 3: ss << "8grfs"; break;
} }
uint32_t off = getBitField(desc, 0, 12); uint32_t off = getBitField(desc, 0, 12);
ss << " from 0x" << std::hex << off << ")"; ss << " from 0x" << std::hex << off << ")";
......
...@@ -616,8 +616,7 @@ public: ...@@ -616,8 +616,7 @@ public:
const char *iga_version_string() const char *iga_version_string()
{ {
#define IGA_EXTERNAL_INTERNAL "ext" return IGA_VERSION_STRING;
return IGA_VERSION_STRING "-" IGA_EXTERNAL_INTERNAL;
} }
......
...@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _IGA_VERSION_HPP_ #ifndef _IGA_VERSION_HPP_
#define _IGA_VERSION_HPP_ #define _IGA_VERSION_HPP_
#define IGA_VERSION_STRING "2.4p1" #define IGA_VERSION_STRING "0.13.14"
#endif // _IGA_VERSION_HPP_ #endif // _IGA_VERSION_HPP_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment