* [igt-dev] [PATCH i-g-t v2 0/1] tools: Remove libdrm dependency
@ 2020-10-02 10:59 Dominik Grzegorzek
2020-10-02 10:59 ` [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: " Dominik Grzegorzek
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Dominik Grzegorzek @ 2020-10-02 10:59 UTC (permalink / raw)
To: igt-dev; +Cc: Chris Wilson
I decided to split previous series into smaller chunks.
(https://patchwork.freedesktop.org/series/81782/)
There are some common patches inlcuded in more than one smaller series.
This one removes libdrm from intel_perf_counters.c.
v2: as intel_bb has changed, meet the demand of adding object to bb
drop merged patch
Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Dominik Grzegorzek (1):
tools/intel_perf_counters: Remove libdrm dependency
tools/intel_perf_counters.c | 109 ++++++++++++++++++------------------
1 file changed, 56 insertions(+), 53 deletions(-)
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: Remove libdrm dependency
2020-10-02 10:59 [igt-dev] [PATCH i-g-t v2 0/1] tools: Remove libdrm dependency Dominik Grzegorzek
@ 2020-10-02 10:59 ` Dominik Grzegorzek
2020-11-02 8:58 ` Zbigniew Kempczyński
2020-10-02 11:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tools: " Patchwork
2020-10-02 14:29 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Dominik Grzegorzek @ 2020-10-02 10:59 UTC (permalink / raw)
To: igt-dev; +Cc: Chris Wilson
Use intel_bb / intel_buf to remove libdrm dependency.
Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
tools/intel_perf_counters.c | 109 ++++++++++++++++++------------------
1 file changed, 56 insertions(+), 53 deletions(-)
diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c
index 5824d9c1..bef66650 100644
--- a/tools/intel_perf_counters.c
+++ b/tools/intel_perf_counters.c
@@ -46,9 +46,9 @@
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_io.h"
-#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_chipset.h"
+#include "intel_bufops.h"
#define GEN5_COUNTER_COUNT 29
@@ -298,8 +298,8 @@ const int gen7_counter_format = 5; /* 0b101 */
int have_totals = 0;
uint32_t *totals;
uint32_t *last_counter;
-static drm_intel_bufmgr *bufmgr;
-struct intel_batchbuffer *batch;
+static struct buf_ops *bops;
+static struct intel_bb *ibb;
/* DW0 */
#define GEN5_MI_REPORT_PERF_COUNT ((0x26 << 23) | (3 - 2))
@@ -327,30 +327,29 @@ static void
gen5_get_counters(void)
{
int i;
- drm_intel_bo *stats_bo;
+ struct intel_buf *stats_buf;
uint32_t *stats_result;
- stats_bo = drm_intel_bo_alloc(bufmgr, "stats", 4096, 4096);
+ stats_buf = intel_buf_create(bops, 4096, 1, 8, 0, I915_TILING_NONE,
+ I915_COMPRESSION_NONE);
+ intel_bb_add_intel_buf(ibb, stats_buf, true);
- BEGIN_BATCH(6, 2);
- OUT_BATCH(GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_0);
- OUT_RELOC(stats_bo,
- I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
- 0);
- OUT_BATCH(0);
+ intel_bb_out(ibb, GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_0);
+ intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ stats_buf->addr.offset);
+ intel_bb_out(ibb, 0);
- OUT_BATCH(GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_1);
- OUT_RELOC(stats_bo,
- I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
- 64);
- OUT_BATCH(0);
+ intel_bb_out(ibb, GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_1);
+ intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
+ I915_GEM_DOMAIN_INSTRUCTION, 64,
+ stats_buf->addr.offset);
+ intel_bb_out(ibb, 0);
- ADVANCE_BATCH();
+ intel_bb_flush_blit(ibb);
- intel_batchbuffer_flush(batch);
-
- drm_intel_bo_map(stats_bo, 0);
- stats_result = stats_bo->virtual;
+ intel_buf_cpu_map(stats_buf, false);
+ stats_result = stats_buf->ptr;
/* skip REPORT_ID, TIMESTAMP */
stats_result += 3;
for (i = 0 ; i < GEN5_COUNTER_COUNT; i++) {
@@ -358,15 +357,15 @@ gen5_get_counters(void)
last_counter[i] = stats_result[i];
}
- drm_intel_bo_unmap(stats_bo);
- drm_intel_bo_unreference(stats_bo);
+ intel_buf_unmap(stats_buf);
+ intel_buf_destroy(stats_buf);
}
static void
gen6_get_counters(void)
{
int i;
- drm_intel_bo *stats_bo;
+ struct intel_buf *stats_buf;
uint32_t *stats_result;
/* Map from counter names to their index in the buffer object */
@@ -378,49 +377,50 @@ gen6_get_counters(void)
31, 30, 29, 28, 27, 26, 25, 24,
};
- stats_bo = drm_intel_bo_alloc(bufmgr, "stats", 4096, 4096);
+ stats_buf = intel_buf_create(bops, 4096, 1, 8, 4096, I915_TILING_NONE,
+ I915_COMPRESSION_NONE);
+ intel_bb_add_intel_buf(ibb, stats_buf, true);
- BEGIN_BATCH(3, 1);
- OUT_BATCH(GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
- OUT_RELOC(stats_bo,
- I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
- MI_COUNTER_ADDRESS_GTT);
- OUT_BATCH(0);
- ADVANCE_BATCH();
+ intel_bb_out(ibb, GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
+ intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
+ I915_GEM_DOMAIN_INSTRUCTION,
+ MI_COUNTER_ADDRESS_GTT, stats_buf->addr.offset);
+ intel_bb_out(ibb, 0);
- intel_batchbuffer_flush_on_ring(batch, I915_EXEC_RENDER);
+ intel_bb_flush_render(ibb);
- drm_intel_bo_map(stats_bo, 0);
- stats_result = stats_bo->virtual;
+ intel_buf_cpu_map(stats_buf, 0);
+ stats_result = stats_buf->ptr;
for (i = 0; i < GEN6_COUNTER_COUNT; i++) {
totals[i] += stats_result[buffer_index[i]] - last_counter[i];
last_counter[i] = stats_result[buffer_index[i]];
}
- drm_intel_bo_unmap(stats_bo);
- drm_intel_bo_unreference(stats_bo);
+ intel_buf_unmap(stats_buf);
+ intel_buf_destroy(stats_buf);
}
static void
gen7_get_counters(void)
{
int i;
- drm_intel_bo *stats_bo;
+ struct intel_buf *stats_buf;
uint32_t *stats_result;
- stats_bo = drm_intel_bo_alloc(bufmgr, "stats", 4096, 4096);
+ stats_buf = intel_buf_create(bops, 4096, 1, 8, 4096, I915_TILING_NONE,
+ I915_COMPRESSION_NONE);
+ intel_bb_add_intel_buf(ibb, stats_buf, true);
- BEGIN_BATCH(3, 1);
- OUT_BATCH(GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
- OUT_RELOC(stats_bo,
- I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, 0);
- OUT_BATCH(0);
- ADVANCE_BATCH();
+ intel_bb_out(ibb, GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
+ intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
+ I915_GEM_DOMAIN_INSTRUCTION, 0,
+ stats_buf->addr.offset);
+ intel_bb_out(ibb, 0);
- intel_batchbuffer_flush_on_ring(batch, I915_EXEC_RENDER);
+ intel_bb_flush_render(ibb);
- drm_intel_bo_map(stats_bo, 0);
- stats_result = stats_bo->virtual;
+ intel_buf_cpu_map(stats_buf, false);
+ stats_result = stats_buf->ptr;
/* skip REPORT_ID, TIMESTAMP */
stats_result += 3;
for (i = 0; i < GEN7_COUNTER_COUNT; i++) {
@@ -431,8 +431,8 @@ gen7_get_counters(void)
last_counter[i] = stats_result[i];
}
- drm_intel_bo_unmap(stats_bo);
- drm_intel_bo_unreference(stats_bo);
+ intel_buf_unmap(stats_buf);
+ intel_buf_destroy(stats_buf);
}
#define STATS_CHECK_FREQUENCY 100
@@ -458,9 +458,8 @@ main(int argc, char **argv)
fd = drm_open_driver(DRIVER_INTEL);
devid = intel_get_drm_devid(fd);
- bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
- drm_intel_bufmgr_gem_enable_reuse(bufmgr);
- batch = intel_batchbuffer_alloc(bufmgr, devid);
+ bops = buf_ops_create(fd);
+ ibb = intel_bb_create(fd, 4096);
if (IS_GEN5(devid)) {
counter_name = gen5_counter_names;
@@ -531,5 +530,9 @@ main(int argc, char **argv)
free(totals);
free(last_counter);
+ intel_bb_destroy(ibb);
+ buf_ops_destroy(bops);
+ close(fd);
+
return 0;
}
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tools: Remove libdrm dependency
2020-10-02 10:59 [igt-dev] [PATCH i-g-t v2 0/1] tools: Remove libdrm dependency Dominik Grzegorzek
2020-10-02 10:59 ` [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: " Dominik Grzegorzek
@ 2020-10-02 11:40 ` Patchwork
2020-10-02 14:29 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-10-02 11:40 UTC (permalink / raw)
To: Dominik Grzegorzek; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 4484 bytes --]
== Series Details ==
Series: tools: Remove libdrm dependency
URL : https://patchwork.freedesktop.org/series/82331/
State : success
== Summary ==
CI Bug Log - changes from IGT_5797 -> IGTPW_5037
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/index.html
Known issues
------------
Here are the changes found in IGTPW_5037 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [PASS][1] -> [DMESG-WARN][2] ([i915#1982]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@vgem_basic@unload:
- fi-kbl-x1275: [PASS][3] -> [DMESG-WARN][4] ([i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-kbl-x1275/igt@vgem_basic@unload.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-kbl-x1275/igt@vgem_basic@unload.html
#### Possible fixes ####
* igt@kms_busy@basic@flip:
- fi-kbl-x1275: [DMESG-WARN][5] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-kbl-x1275/igt@kms_busy@basic@flip.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-kbl-x1275/igt@kms_busy@basic@flip.html
* igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2:
- fi-skl-guc: [DMESG-WARN][7] ([i915#2203]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-skl-guc/igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-skl-guc/igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2.html
#### Warnings ####
* igt@debugfs_test@read_all_entries:
- fi-kbl-x1275: [DMESG-WARN][9] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][10] ([i915#62] / [i915#92]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [DMESG-FAIL][11] ([i915#62]) -> [SKIP][12] ([fdo#109271])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92]) -> [DMESG-WARN][14] ([i915#62] / [i915#92] / [i915#95]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/fi-kbl-x1275/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/fi-kbl-x1275/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (45 -> 38)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-glk-dsi fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5797 -> IGTPW_5037
CI-20190529: 20190529
CI_DRM_9091: 1e20b6560332c04881daeeac61536a9ae9a4d539 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5037: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/index.html
IGT_5797: 1a7ef7eb5e99c9a8f4ffbc13cdae399a01a9aa12 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/index.html
[-- Attachment #1.2: Type: text/html, Size: 5958 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: failure for tools: Remove libdrm dependency
2020-10-02 10:59 [igt-dev] [PATCH i-g-t v2 0/1] tools: Remove libdrm dependency Dominik Grzegorzek
2020-10-02 10:59 ` [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: " Dominik Grzegorzek
2020-10-02 11:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tools: " Patchwork
@ 2020-10-02 14:29 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-10-02 14:29 UTC (permalink / raw)
To: Dominik Grzegorzek; +Cc: igt-dev
[-- Attachment #1.1: Type: text/plain, Size: 15786 bytes --]
== Series Details ==
Series: tools: Remove libdrm dependency
URL : https://patchwork.freedesktop.org/series/82331/
State : failure
== Summary ==
CI Bug Log - changes from IGT_5797_full -> IGTPW_5037_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_5037_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_5037_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_5037_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_schedule@preempt-other@bcs0:
- shard-iclb: [PASS][1] -> [FAIL][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb8/igt@gem_exec_schedule@preempt-other@bcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@gem_exec_schedule@preempt-other@bcs0.html
* igt@gem_exec_schedule@preempt-other@vecs0:
- shard-iclb: [PASS][3] -> [DMESG-WARN][4] +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb8/igt@gem_exec_schedule@preempt-other@vecs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@gem_exec_schedule@preempt-other@vecs0.html
* igt@kms_vblank@pipe-c-wait-busy:
- shard-iclb: [PASS][5] -> [TIMEOUT][6] +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb8/igt@kms_vblank@pipe-c-wait-busy.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@kms_vblank@pipe-c-wait-busy.html
#### Warnings ####
* igt@kms_chamelium@hdmi-frame-dump:
- shard-iclb: [SKIP][7] ([fdo#109284] / [fdo#111827]) -> [TIMEOUT][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb4/igt@kms_chamelium@hdmi-frame-dump.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@kms_chamelium@hdmi-frame-dump.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-mmap-gtt:
- shard-iclb: [SKIP][9] ([fdo#109280]) -> [TIMEOUT][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-mmap-gtt.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-mmap-gtt.html
Known issues
------------
Here are the changes found in IGTPW_5037_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [PASS][11] -> [FAIL][12] ([i915#2389]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-glk3/igt@gem_exec_reloc@basic-many-active@vecs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-glk8/igt@gem_exec_reloc@basic-many-active@vecs0.html
* igt@gem_exec_whisper@basic-fds-forked:
- shard-glk: [PASS][13] -> [DMESG-WARN][14] ([i915#118] / [i915#95]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-glk5/igt@gem_exec_whisper@basic-fds-forked.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-glk7/igt@gem_exec_whisper@basic-fds-forked.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][15] -> [FAIL][16] ([i915#454])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb2/igt@i915_pm_dc@dc6-psr.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
* igt@kms_big_fb@x-tiled-8bpp-rotate-180:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([i915#1635] / [i915#1982]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl2/igt@kms_big_fb@x-tiled-8bpp-rotate-180.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl8/igt@kms_big_fb@x-tiled-8bpp-rotate-180.html
* igt@kms_big_fb@yf-tiled-16bpp-rotate-180:
- shard-glk: [PASS][19] -> [DMESG-WARN][20] ([i915#1982]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-glk3/igt@kms_big_fb@yf-tiled-16bpp-rotate-180.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-glk4/igt@kms_big_fb@yf-tiled-16bpp-rotate-180.html
* igt@kms_cursor_crc@pipe-c-cursor-256x256-random:
- shard-apl: [PASS][21] -> [FAIL][22] ([i915#1635] / [i915#54])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl8/igt@kms_cursor_crc@pipe-c-cursor-256x256-random.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl1/igt@kms_cursor_crc@pipe-c-cursor-256x256-random.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-glk: [PASS][23] -> [FAIL][24] ([i915#72])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-glk3/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-glk8/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- shard-tglb: [PASS][25] -> [DMESG-WARN][26] ([i915#1982]) +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-tglb6/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-tglb5/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc:
- shard-iclb: [PASS][27] -> [FAIL][28] ([i915#49])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc.html
* igt@kms_hdmi_inject@inject-audio:
- shard-tglb: [PASS][29] -> [SKIP][30] ([i915#433])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-tglb6/igt@kms_hdmi_inject@inject-audio.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-tglb5/igt@kms_hdmi_inject@inject-audio.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][31] -> [SKIP][32] ([fdo#109441]) +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb6/igt@kms_psr@psr2_cursor_plane_move.html
#### Possible fixes ####
* igt@gem_mmap_offset@blt-coherency:
- shard-apl: [FAIL][33] ([i915#1635]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl3/igt@gem_mmap_offset@blt-coherency.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl1/igt@gem_mmap_offset@blt-coherency.html
* igt@kms_atomic_transition@2x-modeset-transitions-nonblocking:
- shard-hsw: [INCOMPLETE][35] -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-hsw1/igt@kms_atomic_transition@2x-modeset-transitions-nonblocking.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-hsw7/igt@kms_atomic_transition@2x-modeset-transitions-nonblocking.html
* igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen:
- shard-kbl: [FAIL][37] ([i915#54]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen.html
- shard-apl: [FAIL][39] ([i915#1635] / [i915#54]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl8/igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl3/igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][41] ([i915#96]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_flip@2x-wf_vblank-ts-check-interruptible@ab-vga1-hdmi-a1:
- shard-hsw: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-hsw6/igt@kms_flip@2x-wf_vblank-ts-check-interruptible@ab-vga1-hdmi-a1.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-hsw1/igt@kms_flip@2x-wf_vblank-ts-check-interruptible@ab-vga1-hdmi-a1.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2:
- shard-glk: [FAIL][45] ([i915#79]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-glk7/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a2.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-mmap-wc:
- shard-glk: [FAIL][47] ([i915#49]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-glk6/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-mmap-wc.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-glk5/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-tglb: [DMESG-WARN][49] ([i915#1982]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-stridechange.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-stridechange.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][51] ([fdo#109441]) -> [PASS][52] +2 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb5/igt@kms_psr@psr2_primary_page_flip.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][53] ([i915#1635] / [i915#31]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl4/igt@kms_setmode@basic.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl3/igt@kms_setmode@basic.html
* igt@prime_vgem@sync@bcs0:
- shard-tglb: [INCOMPLETE][55] ([i915#409]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-tglb6/igt@prime_vgem@sync@bcs0.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-tglb7/igt@prime_vgem@sync@bcs0.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-tglb: [SKIP][57] ([i915#1904]) -> [DMESG-WARN][58] ([i915#2411])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-tglb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-tglb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-iclb: [SKIP][59] ([i915#658]) -> [SKIP][60] ([i915#588])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb1/igt@i915_pm_dc@dc3co-vpb-simulation.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@i915_pm_rpm@modeset-pc8-residency-stress:
- shard-iclb: [SKIP][61] ([fdo#109293] / [fdo#109506]) -> [SKIP][62] ([i915#579])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-iclb2/igt@i915_pm_rpm@modeset-pc8-residency-stress.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-iclb1/igt@i915_pm_rpm@modeset-pc8-residency-stress.html
* igt@kms_content_protection@legacy:
- shard-apl: [TIMEOUT][63] ([i915#1319] / [i915#1635]) -> [FAIL][64] ([fdo#110321] / [fdo#110336] / [i915#1635])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl7/igt@kms_content_protection@legacy.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl1/igt@kms_content_protection@legacy.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-apl: [DMESG-FAIL][65] ([fdo#108145] / [i915#1635] / [i915#1982]) -> [FAIL][66] ([fdo#108145] / [i915#1635] / [i915#265])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5797/shard-apl4/igt@kms_plane_alpha_blend@pipe-b-alpha-basic.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/shard-apl4/igt@kms_plane_alpha_blend@pipe-b-alpha-basic.html
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109293]: https://bugs.freedesktop.org/show_bug.cgi?id=109293
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1904]: https://gitlab.freedesktop.org/drm/intel/issues/1904
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#409]: https://gitlab.freedesktop.org/drm/intel/issues/409
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (8 -> 8)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5797 -> IGTPW_5037
CI-20190529: 20190529
CI_DRM_9091: 1e20b6560332c04881daeeac61536a9ae9a4d539 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5037: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/index.html
IGT_5797: 1a7ef7eb5e99c9a8f4ffbc13cdae399a01a9aa12 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5037/index.html
[-- Attachment #1.2: Type: text/html, Size: 18401 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: Remove libdrm dependency
2020-10-02 10:59 ` [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: " Dominik Grzegorzek
@ 2020-11-02 8:58 ` Zbigniew Kempczyński
0 siblings, 0 replies; 5+ messages in thread
From: Zbigniew Kempczyński @ 2020-11-02 8:58 UTC (permalink / raw)
To: Dominik Grzegorzek; +Cc: igt-dev, Chris Wilson
On Fri, Oct 02, 2020 at 12:59:37PM +0200, Dominik Grzegorzek wrote:
> Use intel_bb / intel_buf to remove libdrm dependency.
>
> Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
> Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> tools/intel_perf_counters.c | 109 ++++++++++++++++++------------------
> 1 file changed, 56 insertions(+), 53 deletions(-)
>
> diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c
> index 5824d9c1..bef66650 100644
> --- a/tools/intel_perf_counters.c
> +++ b/tools/intel_perf_counters.c
> @@ -46,9 +46,9 @@
> #include "i915_drm.h"
> #include "drmtest.h"
> #include "intel_io.h"
> -#include "intel_bufmgr.h"
> #include "intel_batchbuffer.h"
> #include "intel_chipset.h"
> +#include "intel_bufops.h"
>
> #define GEN5_COUNTER_COUNT 29
>
> @@ -298,8 +298,8 @@ const int gen7_counter_format = 5; /* 0b101 */
> int have_totals = 0;
> uint32_t *totals;
> uint32_t *last_counter;
> -static drm_intel_bufmgr *bufmgr;
> -struct intel_batchbuffer *batch;
> +static struct buf_ops *bops;
> +static struct intel_bb *ibb;
>
> /* DW0 */
> #define GEN5_MI_REPORT_PERF_COUNT ((0x26 << 23) | (3 - 2))
> @@ -327,30 +327,29 @@ static void
> gen5_get_counters(void)
> {
> int i;
> - drm_intel_bo *stats_bo;
> + struct intel_buf *stats_buf;
> uint32_t *stats_result;
>
> - stats_bo = drm_intel_bo_alloc(bufmgr, "stats", 4096, 4096);
> + stats_buf = intel_buf_create(bops, 4096, 1, 8, 0, I915_TILING_NONE,
> + I915_COMPRESSION_NONE);
> + intel_bb_add_intel_buf(ibb, stats_buf, true);
>
> - BEGIN_BATCH(6, 2);
> - OUT_BATCH(GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_0);
> - OUT_RELOC(stats_bo,
> - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
> - 0);
> - OUT_BATCH(0);
> + intel_bb_out(ibb, GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_0);
> + intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
> + I915_GEM_DOMAIN_INSTRUCTION, 0,
> + stats_buf->addr.offset);
> + intel_bb_out(ibb, 0);
>
> - OUT_BATCH(GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_1);
> - OUT_RELOC(stats_bo,
> - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
> - 64);
> - OUT_BATCH(0);
> + intel_bb_out(ibb, GEN5_MI_REPORT_PERF_COUNT | MI_COUNTER_SET_1);
> + intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
> + I915_GEM_DOMAIN_INSTRUCTION, 64,
> + stats_buf->addr.offset);
> + intel_bb_out(ibb, 0);
>
> - ADVANCE_BATCH();
> + intel_bb_flush_blit(ibb);
>
> - intel_batchbuffer_flush(batch);
> -
> - drm_intel_bo_map(stats_bo, 0);
> - stats_result = stats_bo->virtual;
> + intel_buf_cpu_map(stats_buf, false);
> + stats_result = stats_buf->ptr;
> /* skip REPORT_ID, TIMESTAMP */
> stats_result += 3;
> for (i = 0 ; i < GEN5_COUNTER_COUNT; i++) {
> @@ -358,15 +357,15 @@ gen5_get_counters(void)
> last_counter[i] = stats_result[i];
> }
>
> - drm_intel_bo_unmap(stats_bo);
> - drm_intel_bo_unreference(stats_bo);
> + intel_buf_unmap(stats_buf);
> + intel_buf_destroy(stats_buf);
> }
>
> static void
> gen6_get_counters(void)
> {
> int i;
> - drm_intel_bo *stats_bo;
> + struct intel_buf *stats_buf;
> uint32_t *stats_result;
>
> /* Map from counter names to their index in the buffer object */
> @@ -378,49 +377,50 @@ gen6_get_counters(void)
> 31, 30, 29, 28, 27, 26, 25, 24,
> };
>
> - stats_bo = drm_intel_bo_alloc(bufmgr, "stats", 4096, 4096);
> + stats_buf = intel_buf_create(bops, 4096, 1, 8, 4096, I915_TILING_NONE,
In this case alignment doesn't matter but remember this is for stride,
not buffer size. I would change it to 0 to avoid confusion for readers.
Similar below in intel_buf_create(). Then:
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
--
Zbigniew
> + I915_COMPRESSION_NONE);
> + intel_bb_add_intel_buf(ibb, stats_buf, true);
>
> - BEGIN_BATCH(3, 1);
> - OUT_BATCH(GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
> - OUT_RELOC(stats_bo,
> - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
> - MI_COUNTER_ADDRESS_GTT);
> - OUT_BATCH(0);
> - ADVANCE_BATCH();
> + intel_bb_out(ibb, GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
> + intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
> + I915_GEM_DOMAIN_INSTRUCTION,
> + MI_COUNTER_ADDRESS_GTT, stats_buf->addr.offset);
> + intel_bb_out(ibb, 0);
>
> - intel_batchbuffer_flush_on_ring(batch, I915_EXEC_RENDER);
> + intel_bb_flush_render(ibb);
>
> - drm_intel_bo_map(stats_bo, 0);
> - stats_result = stats_bo->virtual;
> + intel_buf_cpu_map(stats_buf, 0);
> + stats_result = stats_buf->ptr;
> for (i = 0; i < GEN6_COUNTER_COUNT; i++) {
> totals[i] += stats_result[buffer_index[i]] - last_counter[i];
> last_counter[i] = stats_result[buffer_index[i]];
> }
>
> - drm_intel_bo_unmap(stats_bo);
> - drm_intel_bo_unreference(stats_bo);
> + intel_buf_unmap(stats_buf);
> + intel_buf_destroy(stats_buf);
> }
>
> static void
> gen7_get_counters(void)
> {
> int i;
> - drm_intel_bo *stats_bo;
> + struct intel_buf *stats_buf;
> uint32_t *stats_result;
>
> - stats_bo = drm_intel_bo_alloc(bufmgr, "stats", 4096, 4096);
> + stats_buf = intel_buf_create(bops, 4096, 1, 8, 4096, I915_TILING_NONE,
> + I915_COMPRESSION_NONE);
> + intel_bb_add_intel_buf(ibb, stats_buf, true);
>
> - BEGIN_BATCH(3, 1);
> - OUT_BATCH(GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
> - OUT_RELOC(stats_bo,
> - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, 0);
> - OUT_BATCH(0);
> - ADVANCE_BATCH();
> + intel_bb_out(ibb, GEN6_MI_REPORT_PERF_COUNT | (3 - 2));
> + intel_bb_emit_reloc(ibb, stats_buf->handle, I915_GEM_DOMAIN_INSTRUCTION,
> + I915_GEM_DOMAIN_INSTRUCTION, 0,
> + stats_buf->addr.offset);
> + intel_bb_out(ibb, 0);
>
> - intel_batchbuffer_flush_on_ring(batch, I915_EXEC_RENDER);
> + intel_bb_flush_render(ibb);
>
> - drm_intel_bo_map(stats_bo, 0);
> - stats_result = stats_bo->virtual;
> + intel_buf_cpu_map(stats_buf, false);
> + stats_result = stats_buf->ptr;
> /* skip REPORT_ID, TIMESTAMP */
> stats_result += 3;
> for (i = 0; i < GEN7_COUNTER_COUNT; i++) {
> @@ -431,8 +431,8 @@ gen7_get_counters(void)
> last_counter[i] = stats_result[i];
> }
>
> - drm_intel_bo_unmap(stats_bo);
> - drm_intel_bo_unreference(stats_bo);
> + intel_buf_unmap(stats_buf);
> + intel_buf_destroy(stats_buf);
> }
>
> #define STATS_CHECK_FREQUENCY 100
> @@ -458,9 +458,8 @@ main(int argc, char **argv)
> fd = drm_open_driver(DRIVER_INTEL);
> devid = intel_get_drm_devid(fd);
>
> - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
> - drm_intel_bufmgr_gem_enable_reuse(bufmgr);
> - batch = intel_batchbuffer_alloc(bufmgr, devid);
> + bops = buf_ops_create(fd);
> + ibb = intel_bb_create(fd, 4096);
>
> if (IS_GEN5(devid)) {
> counter_name = gen5_counter_names;
> @@ -531,5 +530,9 @@ main(int argc, char **argv)
> free(totals);
> free(last_counter);
>
> + intel_bb_destroy(ibb);
> + buf_ops_destroy(bops);
> + close(fd);
> +
> return 0;
> }
> --
> 2.20.1
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-02 8:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 10:59 [igt-dev] [PATCH i-g-t v2 0/1] tools: Remove libdrm dependency Dominik Grzegorzek
2020-10-02 10:59 ` [igt-dev] [PATCH i-g-t v2 1/1] tools/intel_perf_counters: " Dominik Grzegorzek
2020-11-02 8:58 ` Zbigniew Kempczyński
2020-10-02 11:40 ` [igt-dev] ✓ Fi.CI.BAT: success for tools: " Patchwork
2020-10-02 14:29 ` [igt-dev] ✗ Fi.CI.IGT: failure " 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.