* [igt-dev] [PATCH i-g-t] lib/i915/shaders: Tweak converter.py
@ 2019-01-10 14:23 Michał Winiarski
2019-01-10 14:37 ` Katarzyna Dec
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Michał Winiarski @ 2019-01-10 14:23 UTC (permalink / raw)
To: igt-dev; +Cc: Tvrtko Ursulin
The converter contains #!python3, but is written in python2.
Let's fix that, and while I'm here let's also tweak the README.
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Kalamarz Lukasz <lukasz.kalamarz@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
lib/i915/shaders/README | 12 +++++++-----
lib/i915/shaders/converter.py | 20 +++++++++++---------
2 files changed, 18 insertions(+), 14 deletions(-)
mode change 100644 => 100755 lib/i915/shaders/converter.py
diff --git a/lib/i915/shaders/README b/lib/i915/shaders/README
index 06b9883c..9b7beb96 100644
--- a/lib/i915/shaders/README
+++ b/lib/i915/shaders/README
@@ -10,11 +10,6 @@ https://github.com/intel/intel-graphics-compiler
3. Build iga
cmake . && make
-For maintaining compatibility with our tests there is a bin to hex converter
-written in python:
- $>converter.py input_file > output_file
-e.g.$>python converter.py gen9_iga_output > gen9_hex_array
-
Commands used to generate the shader on gen7
$> m4 gpgpu_fill.gxa > gpgpu_fill.gxm
$> intel-gen4asm -g 7 -o <output> gpgpu_fill.gxm
@@ -23,3 +18,10 @@ Commands used to generate the shader on gen8
$> m4 media_fill.gxa > media_fill.gxm
$> intel-gen4asm -g 8 -o <output> media_fill.gxm
+Commands used to generate the shader using IGA on gen9
+$> iga64 -p=9 -a -o <output> gpgpu_fill_gen9.asm
+
+For maintaining compatibility with our tests there is a bin to hex converter
+written in python
+$> converter.py input_file > output_file
+$> converter.py gen9_iga_output > gen9_hex_array
diff --git a/lib/i915/shaders/converter.py b/lib/i915/shaders/converter.py
old mode 100644
new mode 100755
index 25a79a94..9dea0b75
--- a/lib/i915/shaders/converter.py
+++ b/lib/i915/shaders/converter.py
@@ -1,16 +1,18 @@
#!/usr/bin/env python3
+
import struct
import sys
import argparse
-parser=argparse.ArgumentParser(
- description='''Script for converting shaders from binary to hex ''' )
-parser = argparse.ArgumentParser(prog='converter.py', usage='%(prog)s binary_file')
+parser = argparse.ArgumentParser(
+ prog='converter.py',
+ description='Script for converting shaders from binary to hex',
+ usage='%(prog)s binary_file')
parser.add_argument('binary', nargs=1, help='binary_file')
-args=parser.parse_args()
+args = parser.parse_args()
-print "static const uint32_t kernel[][4] = {"
-with open(sys.argv[1], 'r') as f:
+print("static const uint32_t kernel[][4] = {")
+with open(sys.argv[1], 'rb') as f:
fmt = '<LLLL'
step = struct.calcsize(fmt)
while True:
@@ -18,9 +20,9 @@ with open(sys.argv[1], 'r') as f:
if not buf:
break
elif len(buf) < step:
- buf += '\x00' * (step - len(buf))
+ buf += b'\x00' * (step - len(buf))
val = struct.unpack('<LLLL', buf)
- print "\t{{ 0x{:08x}, 0x{:08x}, 0x{:08x}, 0x{:08x} }},".format(*val)
+ print("\t{{ 0x{:08x}, 0x{:08x}, 0x{:08x}, 0x{:08x} }},".format(*val))
-print "};"
+print("};")
--
2.19.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [igt-dev] [PATCH i-g-t] lib/i915/shaders: Tweak converter.py
2019-01-10 14:23 [igt-dev] [PATCH i-g-t] lib/i915/shaders: Tweak converter.py Michał Winiarski
@ 2019-01-10 14:37 ` Katarzyna Dec
2019-01-10 15:58 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-01-10 22:36 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 4+ messages in thread
From: Katarzyna Dec @ 2019-01-10 14:37 UTC (permalink / raw)
To: Michał Winiarski; +Cc: igt-dev
On Thu, Jan 10, 2019 at 03:23:53PM +0100, Michał Winiarski wrote:
> The converter contains #!python3, but is written in python2.
> Let's fix that, and while I'm here let's also tweak the README.
>
> Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
> Cc: Katarzyna Dec <katarzyna.dec@intel.com>
> Cc: Kalamarz Lukasz <lukasz.kalamarz@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Looks good :) Thanks for making these changes.
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
Kasia :)
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 4+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for lib/i915/shaders: Tweak converter.py
2019-01-10 14:23 [igt-dev] [PATCH i-g-t] lib/i915/shaders: Tweak converter.py Michał Winiarski
2019-01-10 14:37 ` Katarzyna Dec
@ 2019-01-10 15:58 ` Patchwork
2019-01-10 22:36 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-01-10 15:58 UTC (permalink / raw)
To: Michał Winiarski; +Cc: igt-dev
== Series Details ==
Series: lib/i915/shaders: Tweak converter.py
URL : https://patchwork.freedesktop.org/series/55004/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5393 -> IGTPW_2214
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55004/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2214 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: PASS -> FAIL [fdo#108767]
* igt@kms_flip@basic-flip-vs-modeset:
- fi-skl-6700hq: PASS -> DMESG-WARN [fdo#105998] +1
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u3: PASS -> FAIL [fdo#103167]
#### Possible fixes ####
* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160: DMESG-FAIL [fdo#108735] -> PASS
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#105998]: https://bugs.freedesktop.org/show_bug.cgi?id=105998
[fdo#108735]: https://bugs.freedesktop.org/show_bug.cgi?id=108735
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
Participating hosts (49 -> 43)
------------------------------
Additional (1): fi-pnv-d510
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-glk-j4005 fi-icl-y fi-bdw-samus
Build changes
-------------
* IGT: IGT_4758 -> IGTPW_2214
CI_DRM_5393: 0b1d716508e72acc42bb10f4f3d3676585b292c7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2214: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2214/
IGT_4758: f01796214bbde31e37b0593e547ad9436fdd02ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2214/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 4+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for lib/i915/shaders: Tweak converter.py
2019-01-10 14:23 [igt-dev] [PATCH i-g-t] lib/i915/shaders: Tweak converter.py Michał Winiarski
2019-01-10 14:37 ` Katarzyna Dec
2019-01-10 15:58 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-01-10 22:36 ` Patchwork
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-01-10 22:36 UTC (permalink / raw)
To: Michał Winiarski; +Cc: igt-dev
== Series Details ==
Series: lib/i915/shaders: Tweak converter.py
URL : https://patchwork.freedesktop.org/series/55004/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5393_full -> IGTPW_2214_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55004/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2214_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@pi-ringfull-bsd2:
- shard-kbl: NOTRUN -> FAIL [fdo#103158]
* igt@kms_busy@extended-modeset-hang-newfb-render-b:
- shard-kbl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-glk: PASS -> FAIL [fdo#108145] +1
- shard-kbl: PASS -> FAIL [fdo#107725] / [fdo#108145]
* igt@kms_cursor_crc@cursor-128x128-dpms:
- shard-apl: PASS -> DMESG-FAIL [fdo#103232] / [fdo#103558] / [fdo#105602]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: PASS -> FAIL [fdo#103232] +3
* igt@kms_cursor_crc@cursor-size-change:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: PASS -> FAIL [fdo#103167] +3
- shard-kbl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-wc:
- shard-glk: PASS -> FAIL [fdo#103167] +3
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-glk: PASS -> FAIL [fdo#103166] +3
* igt@kms_setmode@basic:
- shard-kbl: PASS -> FAIL [fdo#99912]
* igt@prime_vgem@wait-blt:
- shard-apl: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] +15
#### Possible fixes ####
* igt@gem_exec_reloc@basic-write-wc-active:
- shard-snb: INCOMPLETE [fdo#105411] -> PASS
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-glk: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_color@pipe-a-ctm-max:
- shard-kbl: FAIL [fdo#108147] -> PASS
- shard-apl: FAIL [fdo#108147] -> PASS
* igt@kms_cursor_crc@cursor-128x128-onscreen:
- shard-kbl: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-256x85-random:
- shard-glk: FAIL [fdo#103232] -> PASS +2
* igt@kms_cursor_crc@cursor-64x21-random:
- shard-apl: FAIL [fdo#103232] -> PASS +3
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: FAIL [fdo#105363] -> PASS
* igt@kms_flip@dpms-vs-vblank-race:
- shard-glk: FAIL [fdo#103060] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-glk: FAIL [fdo#103167] -> PASS +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-kbl: FAIL [fdo#103167] -> PASS +1
- shard-apl: FAIL [fdo#103167] -> PASS +2
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +2
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: FAIL [fdo#108145] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
- shard-kbl: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-glk: FAIL [fdo#103166] -> PASS +2
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: DMESG-FAIL [fdo#108950] -> PASS
* igt@kms_setmode@basic:
- shard-hsw: FAIL [fdo#99912] -> PASS
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
* igt@perf@rc6-disable:
- shard-kbl: FAIL [fdo#103179] -> PASS
#### Warnings ####
* igt@i915_suspend@shrink:
- shard-snb: INCOMPLETE [fdo#105411] / [fdo#106886] -> DMESG-WARN [fdo#109244]
- shard-hsw: DMESG-WARN [fdo#109244] -> INCOMPLETE [fdo#103540] / [fdo#106886]
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-apl: FAIL [fdo#106641] -> DMESG-FAIL [fdo#103558] / [fdo#105602] / [fdo#106641]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
- shard-apl: FAIL [fdo#103167] -> DMESG-WARN [fdo#103558] / [fdo#105602]
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-apl: FAIL [fdo#108145] -> DMESG-FAIL [fdo#103558] / [fdo#105602] / [fdo#108145]
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103158]: https://bugs.freedesktop.org/show_bug.cgi?id=103158
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103179]: https://bugs.freedesktop.org/show_bug.cgi?id=103179
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
[fdo#107725]: https://bugs.freedesktop.org/show_bug.cgi?id=107725
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108950]: https://bugs.freedesktop.org/show_bug.cgi?id=108950
[fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (6 -> 5)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* IGT: IGT_4758 -> IGTPW_2214
* Piglit: piglit_4509 -> None
CI_DRM_5393: 0b1d716508e72acc42bb10f4f3d3676585b292c7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2214: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2214/
IGT_4758: f01796214bbde31e37b0593e547ad9436fdd02ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2214/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-10 22:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-10 14:23 [igt-dev] [PATCH i-g-t] lib/i915/shaders: Tweak converter.py Michał Winiarski
2019-01-10 14:37 ` Katarzyna Dec
2019-01-10 15:58 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-01-10 22:36 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.