Skip to content

Commit 9ae2ccd

Browse files
petechouigcbot
authored andcommitted
[Autobackout][FuncReg]Revert of change: 48e6f44
ZEBIN: Separate version information from zeinfo md file. Separate version information as a version.md from zeinfo md file because now it should reflect all ELF section and zeinfo attribute changes.
1 parent 152b64c commit 9ae2ccd

File tree

6 files changed

+28
-72
lines changed

6 files changed

+28
-72
lines changed

IGC/ZEBinWriter/zebin/source/ZEELF.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,9 @@ enum R_TYPE_ZEBIN
4646

4747
// ELF note type for INTELGT
4848
enum {
49-
// The description is the Product family stored in a 4-byte ELF word
5049
NT_INTELGT_PRODUCT_FAMILY = 1,
51-
// The description is the GFXCORE family stored in a 4-byte ELF word
5250
NT_INTELGT_GFXCORE_FAMILY = 2,
53-
// The description is the TargetMetadata structure defined below
5451
NT_INTELGT_TARGET_METADATA = 3,
55-
// The description represents the ZEBIN ELF file version that reflects the
56-
// attribute and section changes. The content is stored in a nul-terminated
57-
// string and the format is "<Major number>.<Minor number>".
58-
NT_INTELGT_ZEBIN_VERSION = 4,
5952
};
6053

6154
struct TargetMetadata {

IGC/ZEBinWriter/zebin/source/ZEELFObjectBuilder.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -591,16 +591,6 @@ std::pair<uint64_t, uint64_t> ELFWriter::writeCompatibilityNote() {
591591
padToRequiredAlign();
592592
};
593593

594-
auto writeOneStrNote = [&](StringRef owner, StringRef desc, uint32_t type) {
595-
m_W.write<uint32_t>(owner.size() + 1);
596-
m_W.write<uint32_t>(desc.size() + 1);
597-
m_W.write<uint32_t>(type);
598-
m_W.OS << owner << '\0';
599-
padToRequiredAlign();
600-
m_W.OS << desc << '\0';
601-
padToRequiredAlign();
602-
};
603-
604594
// Align the section offset to the required alignment first.
605595
// TODO: Handle the section alignment in a more generic place..
606596
padToRequiredAlign();
@@ -619,11 +609,6 @@ std::pair<uint64_t, uint64_t> ELFWriter::writeCompatibilityNote() {
619609
writeOneNote("IntelGT",
620610
m_ObjBuilder.m_metadata.packed,
621611
NT_INTELGT_TARGET_METADATA);
622-
623-
// write NT_INTELGT_ZEBIN_VERSION
624-
writeOneStrNote("IntelGT",
625-
m_ObjBuilder.m_zeInfoSection->getZeInfo().version,
626-
NT_INTELGT_ZEBIN_VERSION);
627612
return std::make_pair(start_off, m_W.OS.tell() - start_off);
628613
}
629614

IGC/ZEBinWriter/zebin/source/autogen/ZEInfo.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ struct zeInfoContainer
179179
HostAccessesTy global_host_access_table;
180180
};
181181
struct PreDefinedAttrGetter{
182-
static zeinfo_str_t getVersionNumber() { return "1.16"; }
182+
static zeinfo_str_t getVersionNumber() { return "1.15"; }
183183

184184
enum class ArgThreadSchedulingMode {
185185
age_based,

IGC/ZEBinWriter/zebin/spec/elf.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ SPDX-License-Identifier: MIT
77
============================= end_copyright_notice ==========================-->
88

99
# ELF Layout
10-
The version information of ZEBIN can be found in version.md. ELF changes should
11-
be documented properly in version.md.
1210

1311
| Contents | Description | Section Type |
1412
| ------ | ------ | ------ |
@@ -104,16 +102,9 @@ recognize both the owner name (INTELGT) and the type of an ELF note entry to
104102
interpret its description.
105103
~~~
106104
enum {
107-
// The description is the Product family stored in a 4-byte ELF word
108-
NT_INTELGT_PRODUCT_FAMILY = 1,
109-
// The description is the GFXCORE family stored in a 4-byte ELF word
110-
NT_INTELGT_GFXCORE_FAMILY = 2,
111-
// The description is the TargetMetadata structure defined below
112-
NT_INTELGT_TARGET_METADATA = 3,
113-
// The description represents the ZEBIN ELF file version that reflects the
114-
// attribute and section changes. The content is stored in a nul-terminated
115-
// string and the format is "<Major number>.<Minor number>".
116-
NT_INTELGT_ZEBIN_VERSION = 4,
105+
NT_INTELGT_PRODUCT_FAMILY = 1, // the description is the Product family stored in a 4-byte ELF word
106+
NT_INTELGT_GFXCORE_FAMILY = 2, // the description is the GFXCORE family stored in a 4-byte ELF word
107+
NT_INTELGT_TARGET_METADATA = 3, // the description is the TargetMetadata structure defined below
117108
};
118109
~~~
119110

IGC/ZEBinWriter/zebin/spec/version.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

IGC/ZEBinWriter/zebin/spec/zeinfo.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ SPDX-License-Identifier: MIT
66
77
============================= end_copyright_notice ==========================-->
88

9-
## Version
10-
The version information of ZEBIN can be found in version.md. ZEINFO changes
11-
should be documented properly in version.md.
9+
# ZE Info
10+
Version 1.15
1211

1312
## Grammar
1413

@@ -354,3 +353,25 @@ This section defines mapping between device and host name of a global variable.
354353
| host_name | str | User-specified global variable name derived from HostAccesINTEL decoration. Used to access global variable from host API calls. |
355354
<!--- HostAccess HostAccesses --->
356355

356+
## Versioning
357+
Format: \<_Major number_\>.\<_Minor number_\>
358+
- Major number: Increase when non-backward-compatible features are added. For example, rename attributes or remove attributes.
359+
- Minor number: Increase when backward-compatible features are added. For example, add new attributes.
360+
361+
## Change Note
362+
- **Version 1.15**: Add image_type, image_transformable, and sampler_type attributes to payload argument. Add new image and sampler argument types.
363+
- **Version 1.14**: Add slm_alignment to payload argument.
364+
- **Version 1.13**: Add functions with the name and execution env.
365+
- **Version 1.12**: Add global_host_access_table to container.
366+
- **Version 1.11**: Add require_disable_eufusion attribute.
367+
- **Version 1.10**: Add thread_scheduling_mode to execution_env.
368+
- **Version 1.9**: Add source_offset to payload argument.
369+
- **Version 1.8**: Add inline_data_payload_size to execution_env.
370+
- **Version 1.7**: Add debug_env to kernel.
371+
- **Version 1.6**: Remove actual_kernel_start_offset from execution environment.
372+
- **Version 1.5**: Add payload_argument type work_dimensions.
373+
- **Version 1.4**: Add sampler_index to payload arguments.
374+
- **Version 1.3**: Add printf_buffer to argument_type.
375+
- **Version 1.2**: Add buffer_offset to argument_type.
376+
- **Version 1.1**: Add experimental_properties to kernel.
377+
- **Version 1.0**: Add version number. Add slot to per_thread_memory_buffers. Rename shared_local_memory to slm in memory_addressing_mode.

0 commit comments

Comments
 (0)