[igt-dev] [PATCH 1/7] tests/i915/gem: remove igt_skip_on_simulation()

Swati Sharma
2019-10-16T07:58:10Z

Removing igt_skip_on_simulation() from all the gem tests
since this feature is not supported anymore.

Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Karthik B S <karthik.b.s@intel.com>
---
tests/i915/gem_busy.c | 2 --
tests/i915/gem_caching.c | 2 --
tests/i915/gem_concurrent_all.c | 2 --
tests/i915/gem_create.c | 2 --
tests/i915/gem_cs_prefetch.c | 2 --
tests/i915/gem_cs_tlb.c | 2 --
tests/i915/gem_ctx_exec.c | 2 --
tests/i915/gem_ctx_switch.c | 6 ------
tests/i915/gem_ctx_thrash.c | 2 --
tests/i915/gem_double_irq_loop.c | 2 --
tests/i915/gem_eio.c | 2 --
tests/i915/gem_exec_async.c | 2 --
tests/i915/gem_exec_balancer.c | 2 --
tests/i915/gem_exec_blt.c | 2 --
tests/i915/gem_exec_capture.c | 2 --
tests/i915/gem_exec_fence.c | 2 --
tests/i915/gem_exec_gttfill.c | 2 --
tests/i915/gem_exec_lut_handle.c | 2 --
tests/i915/gem_exec_schedule.c | 2 --
tests/i915/gem_exec_suspend.c | 2 --
tests/i915/gem_fence_thrash.c | 2 --
tests/i915/gem_fence_upload.c | 2 --
tests/i915/gem_fenced_exec_thrash.c | 2 --
tests/i915/gem_flink_race.c | 2 --
tests/i915/gem_gtt_cpu_tlb.c | 3 ---
tests/i915/gem_gtt_hog.c | 2 --
tests/i915/gem_gtt_speed.c | 2 --
tests/i915/gem_largeobject.c | 2 --
tests/i915/gem_madvise.c | 2 --
tests/i915/gem_mmap_offset_exhaustion.c | 2 --
tests/i915/gem_partial_pwrite_pread.c | 2 --
tests/i915/gem_persistent_relocs.c | 2 --
tests/i915/gem_pread_after_blit.c | 2 --
tests/i915/gem_pwrite_pread.c | 2 --
tests/i915/gem_pwrite_snooped.c | 2 --
tests/i915/gem_read_read_speed.c | 2 --
tests/i915/gem_readwrite.c | 2 --
tests/i915/gem_reloc_vs_gpu.c | 2 --
tests/i915/gem_render_linear_blits.c | 3 ---
tests/i915/gem_render_tiled_blits.c | 3 ---
tests/i915/gem_reset_stats.c | 1 -
tests/i915/gem_ringfill.c | 2 --
tests/i915/gem_set_tiling_vs_blt.c | 2 --
tests/i915/gem_set_tiling_vs_gtt.c | 2 --
tests/i915/gem_set_tiling_vs_pwrite.c | 2 --
tests/i915/gem_shrink.c | 2 --
tests/i915/gem_softpin.c | 2 --
tests/i915/gem_spin_batch.c | 2 --
tests/i915/gem_stolen.c | 2 --
tests/i915/gem_storedw_batches_loop.c | 2 --
tests/i915/gem_sync.c | 2 --
tests/i915/gem_threaded_access_tiled.c | 2 --
tests/i915/gem_tiled_fence_blits.c | 3 ---
tests/i915/gem_tiled_partial_pwrite_pread.c | 2 --
tests/i915/gem_unfence_active_buffers.c | 2 --
tests/i915/gem_unref_active_buffers.c | 2 --
tests/i915/gem_wait.c | 2 --
tests/i915/gem_write_read_ring_switch.c | 2 --
58 files changed, 123 deletions(-)

diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c
index a5535870..4ae88a96 100644
--- a/tests/i915/gem_busy.c
+++ b/tests/i915/gem_busy.c
@@ -557,7 +557,6 @@ igt_main
igt_subtest_f("%shang-%s",
e->class == I915_ENGINE_CLASS_RENDER
? "basic-" : "", e->name) {
- igt_skip_on_simulation();
gem_quiescent_gpu(fd);
basic(fd, e, HANG);
}
@@ -571,7 +570,6 @@ igt_main

__for_each_physical_engine(fd, e) {
igt_subtest_f("extended-hang-%s", e->name) {
- igt_skip_on_simulation();
igt_require(gem_class_can_store_dword(fd, e->class));

gem_quiescent_gpu(fd);
diff --git a/tests/i915/gem_caching.c b/tests/i915/gem_caching.c
index ce9e6345..7c1f6410 100644
--- a/tests/i915/gem_caching.c
+++ b/tests/i915/gem_caching.c
@@ -106,8 +106,6 @@ igt_main
uint8_t *cpu_ptr;
uint8_t *gtt_ptr;

- igt_skip_on_simulation();
-
igt_fixture {
srandom(0xdeadbeef);

diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 266995d1..36cd3574 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -1778,8 +1778,6 @@ igt_main
char name[80];
int count = 0;

- igt_skip_on_simulation();
-
if (strstr(igt_test_name(), "all"))
all = true;

diff --git a/tests/i915/gem_create.c b/tests/i915/gem_create.c
index aed7d1ce..1a657be0 100644
--- a/tests/i915/gem_create.c
+++ b/tests/i915/gem_create.c
@@ -257,8 +257,6 @@ igt_main
{
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
}
diff --git a/tests/i915/gem_cs_prefetch.c b/tests/i915/gem_cs_prefetch.c
index 2b865368..ffc757a1 100644
--- a/tests/i915/gem_cs_prefetch.c
+++ b/tests/i915/gem_cs_prefetch.c
@@ -141,8 +141,6 @@ igt_main
{
const struct intel_execution_engine *e;

- igt_skip_on_simulation();
-
for (e = intel_execution_engines; e->name; e++)
igt_subtest_f("%s", e->name)
test_ring(e->exec_id | e->flags);
diff --git a/tests/i915/gem_cs_tlb.c b/tests/i915/gem_cs_tlb.c
index 13de5499..0c1e0949 100644
--- a/tests/i915/gem_cs_tlb.c
+++ b/tests/i915/gem_cs_tlb.c
@@ -143,8 +143,6 @@ igt_main
const struct intel_execution_engine2 *e;
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index 614a9f40..74ca2a3f 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -242,8 +242,6 @@ igt_main
igt_subtest("reset-pin-leak") {
int i;

- igt_skip_on_simulation();
-
/*
* Use an explicit context to isolate the test from
* any major code changes related to the per-file
diff --git a/tests/i915/gem_ctx_switch.c b/tests/i915/gem_ctx_switch.c
index c071def7..6b233ff0 100644
--- a/tests/i915/gem_ctx_switch.c
+++ b/tests/i915/gem_ctx_switch.c
@@ -365,9 +365,6 @@ igt_main

igt_subtest_f("legacy-%s%s", e->name, p->name)
single(fd, light, e2, p->flags, 1, 5);
-
- igt_skip_on_simulation();
-
igt_subtest_f("legacy-%s-heavy%s",
e->name, p->name)
single(fd, heavy, e2, p->flags, 1, 5);
@@ -394,9 +391,6 @@ igt_main

igt_subtest_f("%s%s", e2->name, p->name)
single(fd, light, e2, p->flags, 1, 5);
-
- igt_skip_on_simulation();
-
igt_subtest_f("%s-heavy%s", e2->name, p->name)
single(fd, heavy, e2, p->flags, 1, 5);
igt_subtest_f("%s-forked%s", e2->name, p->name)
diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
index b25f95f1..b8bb0e26 100644
--- a/tests/i915/gem_ctx_thrash.c
+++ b/tests/i915/gem_ctx_thrash.c
@@ -361,8 +361,6 @@ static void threads(void)

igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("single")
single("single", false);
igt_subtest("engines")
diff --git a/tests/i915/gem_double_irq_loop.c b/tests/i915/gem_double_irq_loop.c
index b326fc58..b7ff4a84 100644
--- a/tests/i915/gem_double_irq_loop.c
+++ b/tests/i915/gem_double_irq_loop.c
@@ -93,8 +93,6 @@ igt_simple_main
int fd;
int devid;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c
index 892f3657..47534f8d 100644
--- a/tests/i915/gem_eio.c
+++ b/tests/i915/gem_eio.c
@@ -905,8 +905,6 @@ exit_handler(int sig)

igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_device_drop_master(fd);
diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
index 9a06af7e..4b0ba0d1 100644
--- a/tests/i915/gem_exec_async.c
+++ b/tests/i915/gem_exec_async.c
@@ -188,8 +188,6 @@ igt_main
const struct intel_execution_engine *e;
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c
index e52f5df9..cf2a4c5d 100644
--- a/tests/i915/gem_exec_balancer.c
+++ b/tests/i915/gem_exec_balancer.c
@@ -1421,8 +1421,6 @@ igt_main
{
int i915 = -1;

- igt_skip_on_simulation();
-
igt_fixture {
i915 = drm_open_driver(DRIVER_INTEL);
igt_require_gem(i915);
diff --git a/tests/i915/gem_exec_blt.c b/tests/i915/gem_exec_blt.c
index ffb60d0c..fb2f3693 100644
--- a/tests/i915/gem_exec_blt.c
+++ b/tests/i915/gem_exec_blt.c
@@ -307,8 +307,6 @@ igt_main
int min = -1, max = -1;
int fd, sysfs;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index 4457496d..e6a549f3 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -531,8 +531,6 @@ igt_main
int fd = -1;
int dir = -1;

- igt_skip_on_simulation();
-
igt_fixture {
int gen;

diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index 2f04d7af..9ecb3770 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -1593,8 +1593,6 @@ igt_main
igt_subtest_group {
igt_hang_t hang;

- igt_skip_on_simulation();
-
igt_fixture {
hang = igt_allow_hang(i915, 0, 0);
}
diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
index efd612bb..1bf0f0bf 100644
--- a/tests/i915/gem_exec_gttfill.c
+++ b/tests/i915/gem_exec_gttfill.c
@@ -210,8 +210,6 @@ igt_main
const struct intel_execution_engine *e;
int device = -1;

- igt_skip_on_simulation();
-
igt_fixture {
device = drm_open_driver(DRIVER_INTEL);
igt_require_gem(device);
diff --git a/tests/i915/gem_exec_lut_handle.c b/tests/i915/gem_exec_lut_handle.c
index 98e6ae5a..b7b69157 100644
--- a/tests/i915/gem_exec_lut_handle.c
+++ b/tests/i915/gem_exec_lut_handle.c
@@ -101,8 +101,6 @@ igt_simple_main
uint32_t reloc_handle;
int size;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);

diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
index ddcb1f21..59b640bd 100644
--- a/tests/i915/gem_exec_schedule.c
+++ b/tests/i915/gem_exec_schedule.c
@@ -1669,8 +1669,6 @@ igt_main
const struct intel_execution_engine *e;
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
igt_require_sw_sync();

diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
index e43a16e9..bef3a167 100644
--- a/tests/i915/gem_exec_suspend.c
+++ b/tests/i915/gem_exec_suspend.c
@@ -243,8 +243,6 @@ igt_main
igt_hang_t hang;
int fd;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_fence_thrash.c b/tests/i915/gem_fence_thrash.c
index 2d7fb2ff..c85c38bb 100644
--- a/tests/i915/gem_fence_thrash.c
+++ b/tests/i915/gem_fence_thrash.c
@@ -234,8 +234,6 @@ static int run_test(int threads_per_fence, void *f, int tiling,

igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("bo-write-verify-none")
igt_assert(run_test(0, bo_write_verify, I915_TILING_NONE, 80) == 0);

diff --git a/tests/i915/gem_fence_upload.c b/tests/i915/gem_fence_upload.c
index f3b0e62f..17580aff 100644
--- a/tests/i915/gem_fence_upload.c
+++ b/tests/i915/gem_fence_upload.c
@@ -388,8 +388,6 @@ static void wc_contention(void)

igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("performance")
performance();
igt_subtest("thread-contention")
diff --git a/tests/i915/gem_fenced_exec_thrash.c b/tests/i915/gem_fenced_exec_thrash.c
index 145b8bf8..e40fa438 100644
--- a/tests/i915/gem_fenced_exec_thrash.c
+++ b/tests/i915/gem_fenced_exec_thrash.c
@@ -160,8 +160,6 @@ igt_main
unsigned int num_fences = 0;
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_flink_race.c b/tests/i915/gem_flink_race.c
index 322befe9..c1f5d5d5 100644
--- a/tests/i915/gem_flink_race.c
+++ b/tests/i915/gem_flink_race.c
@@ -197,8 +197,6 @@ static void test_flink_close(void)

igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("flink_name")
test_flink_name(5);

diff --git a/tests/i915/gem_gtt_cpu_tlb.c b/tests/i915/gem_gtt_cpu_tlb.c
index cf3c543d..5d39e123 100644
--- a/tests/i915/gem_gtt_cpu_tlb.c
+++ b/tests/i915/gem_gtt_cpu_tlb.c
@@ -73,11 +73,8 @@ igt_simple_main
int fd;
int i;
uint32_t handle;
-
uint32_t *ptr;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);

handle = gem_create(fd, OBJ_SIZE);
diff --git a/tests/i915/gem_gtt_hog.c b/tests/i915/gem_gtt_hog.c
index ca730649..7f2c26d7 100644
--- a/tests/i915/gem_gtt_hog.c
+++ b/tests/i915/gem_gtt_hog.c
@@ -163,8 +163,6 @@ igt_simple_main
igt_require_gem(fd);
close(fd);

- igt_skip_on_simulation();
-
data.fd = drm_open_driver(DRIVER_INTEL);
data.devid = intel_get_drm_devid(data.fd);
data.intel_gen = intel_gen(data.devid);
diff --git a/tests/i915/gem_gtt_speed.c b/tests/i915/gem_gtt_speed.c
index dfa7216c..e3cbc84c 100644
--- a/tests/i915/gem_gtt_speed.c
+++ b/tests/i915/gem_gtt_speed.c
@@ -112,8 +112,6 @@ igt_simple_main_args("s:", NULL, help_str, opt_handler, NULL)
int loop, i, tiling;
int fd;

- igt_skip_on_simulation();
-
igt_assert_f(size != 0, "Invalid object size specified\n");

if (cpu) {
diff --git a/tests/i915/gem_largeobject.c b/tests/i915/gem_largeobject.c
index 518396fa..fc9296cd 100644
--- a/tests/i915/gem_largeobject.c
+++ b/tests/i915/gem_largeobject.c
@@ -77,8 +77,6 @@ igt_simple_main
{
int fd;

- igt_skip_on_simulation();
-
data = malloc(OBJ_SIZE);
igt_assert(data);

diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 729a4d33..7162a5c3 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -149,8 +149,6 @@ dontneed_before_exec(void)

igt_main
{
- igt_skip_on_simulation();
-
igt_subtest("dontneed-before-mmap")
dontneed_before_mmap();

diff --git a/tests/i915/gem_mmap_offset_exhaustion.c b/tests/i915/gem_mmap_offset_exhaustion.c
index 8c8e3fa2..f243507e 100644
--- a/tests/i915/gem_mmap_offset_exhaustion.c
+++ b/tests/i915/gem_mmap_offset_exhaustion.c
@@ -78,8 +78,6 @@ igt_simple_main
{
int fd, i;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);

/* we have 32bit of address space, so try to fit one MB more
diff --git a/tests/i915/gem_partial_pwrite_pread.c b/tests/i915/gem_partial_pwrite_pread.c
index 49e086ed..afd43694 100644
--- a/tests/i915/gem_partial_pwrite_pread.c
+++ b/tests/i915/gem_partial_pwrite_pread.c
@@ -248,8 +248,6 @@ igt_main
{
srandom(0xdeadbeef);

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_persistent_relocs.c b/tests/i915/gem_persistent_relocs.c
index 2ab7091a..e6226f41 100644
--- a/tests/i915/gem_persistent_relocs.c
+++ b/tests/i915/gem_persistent_relocs.c
@@ -319,8 +319,6 @@ int fd;
#define MAX_BLT_SIZE 128
igt_main
{
- igt_skip_on_simulation();
-
memset(blob, 'A', sizeof(blob));

igt_fixture {
diff --git a/tests/i915/gem_pread_after_blit.c b/tests/i915/gem_pread_after_blit.c
index cee92127..e12b5d65 100644
--- a/tests/i915/gem_pread_after_blit.c
+++ b/tests/i915/gem_pread_after_blit.c
@@ -208,8 +208,6 @@ igt_main
{ NULL, -1 },
}, *t;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_pwrite_pread.c b/tests/i915/gem_pwrite_pread.c
index 422db34d..9287c677 100644
--- a/tests/i915/gem_pwrite_pread.c
+++ b/tests/i915/gem_pwrite_pread.c
@@ -274,8 +274,6 @@ igt_main_args("s:", NULL, help_str, opt_handler, NULL)
uint32_t buf[20];
int count;

- igt_skip_on_simulation();
-
if (object_size == 0)
object_size = OBJECT_SIZE;
object_size = (object_size + 3) & -4;
diff --git a/tests/i915/gem_pwrite_snooped.c b/tests/i915/gem_pwrite_snooped.c
index 80f590de..14f4c44a 100644
--- a/tests/i915/gem_pwrite_snooped.c
+++ b/tests/i915/gem_pwrite_snooped.c
@@ -127,8 +127,6 @@ static void test(int w, int h)

igt_simple_main
{
- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
diff --git a/tests/i915/gem_read_read_speed.c b/tests/i915/gem_read_read_speed.c
index 5f1356eb..8b5ba8f7 100644
--- a/tests/i915/gem_read_read_speed.c
+++ b/tests/i915/gem_read_read_speed.c
@@ -180,8 +180,6 @@ igt_main
drm_intel_bufmgr *bufmgr = NULL;
int fd, i;

- igt_skip_on_simulation();
-
igt_fixture {
int devid;

diff --git a/tests/i915/gem_readwrite.c b/tests/i915/gem_readwrite.c
index fdf279f1..6b2977c1 100644
--- a/tests/i915/gem_readwrite.c
+++ b/tests/i915/gem_readwrite.c
@@ -81,8 +81,6 @@ igt_main
uint8_t buf[OBJECT_SIZE];
int ret;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);

diff --git a/tests/i915/gem_reloc_vs_gpu.c b/tests/i915/gem_reloc_vs_gpu.c
index 46f14517..ebc71a68 100644
--- a/tests/i915/gem_reloc_vs_gpu.c
+++ b/tests/i915/gem_reloc_vs_gpu.c
@@ -297,8 +297,6 @@ int fd;
#define MAX_BLT_SIZE 128
igt_main
{
- igt_skip_on_simulation();
-
memset(blob, 'A', sizeof(blob));

igt_fixture {
diff --git a/tests/i915/gem_render_linear_blits.c b/tests/i915/gem_render_linear_blits.c
index 667ee872..a726652b 100644
--- a/tests/i915/gem_render_linear_blits.c
+++ b/tests/i915/gem_render_linear_blits.c
@@ -199,9 +199,6 @@ igt_main
run_test(fd, 2);
}

- /* the rest of the tests are too long for simulation */
- igt_skip_on_simulation();
-
igt_subtest("aperture-thrash") {
count = 3 * gem_aperture_size(fd) / SIZE / 2;
intel_require_memory(count, SIZE, CHECK_RAM);
diff --git a/tests/i915/gem_render_tiled_blits.c b/tests/i915/gem_render_tiled_blits.c
index 12950061..14018329 100644
--- a/tests/i915/gem_render_tiled_blits.c
+++ b/tests/i915/gem_render_tiled_blits.c
@@ -210,9 +210,6 @@ igt_main
run_test(fd, 2);
}

- /* the rest of the tests are too long for simulation */
- igt_skip_on_simulation();
-
igt_subtest("aperture-thrash") {
count = 3 * gem_aperture_size(fd) / SIZE / 2;
intel_require_memory(count, SIZE, CHECK_RAM);
diff --git a/tests/i915/gem_reset_stats.c b/tests/i915/gem_reset_stats.c
index ac9af23f..689c4afd 100644
--- a/tests/i915/gem_reset_stats.c
+++ b/tests/i915/gem_reset_stats.c
@@ -773,7 +773,6 @@ static bool gem_has_reset_stats(int fd)
igt_main
{
const struct intel_execution_engine *e;
- igt_skip_on_simulation();

igt_fixture {
int fd;
diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
index c728e1cd..cf85f797 100644
--- a/tests/i915/gem_ringfill.c
+++ b/tests/i915/gem_ringfill.c
@@ -286,8 +286,6 @@ igt_main
e->name,
m->suffix) {
igt_skip_on(m->flags & NEWFD && master);
- if (m->flags & (HANG|SUSPEND|HIBERNATE))
- igt_skip_on_simulation();
run_test(fd, e->exec_id | e->flags,
m->flags, m->timeout);
}
diff --git a/tests/i915/gem_set_tiling_vs_blt.c b/tests/i915/gem_set_tiling_vs_blt.c
index 01230547..c317d1ef 100644
--- a/tests/i915/gem_set_tiling_vs_blt.c
+++ b/tests/i915/gem_set_tiling_vs_blt.c
@@ -225,8 +225,6 @@ igt_main
int i;
uint32_t tiling, tiling_after;

- igt_skip_on_simulation();
-
igt_fixture {
for (i = 0; i < 1024*256; i++)
data[i] = i;
diff --git a/tests/i915/gem_set_tiling_vs_gtt.c b/tests/i915/gem_set_tiling_vs_gtt.c
index 2611ec55..618c2d05 100644
--- a/tests/i915/gem_set_tiling_vs_gtt.c
+++ b/tests/i915/gem_set_tiling_vs_gtt.c
@@ -56,8 +56,6 @@ igt_simple_main
bool tiling_changed;
int tile_height;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);

if (IS_GEN2(intel_get_drm_devid(fd)))
diff --git a/tests/i915/gem_set_tiling_vs_pwrite.c b/tests/i915/gem_set_tiling_vs_pwrite.c
index f0126b64..25a28191 100644
--- a/tests/i915/gem_set_tiling_vs_pwrite.c
+++ b/tests/i915/gem_set_tiling_vs_pwrite.c
@@ -54,8 +54,6 @@ igt_simple_main
int i;
uint32_t handle;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);

for (i = 0; i < OBJECT_SIZE/4; i++)
diff --git a/tests/i915/gem_shrink.c b/tests/i915/gem_shrink.c
index 3db754f5..1f980ece 100644
--- a/tests/i915/gem_shrink.c
+++ b/tests/i915/gem_shrink.c
@@ -424,8 +424,6 @@ igt_main
uint64_t alloc_size = 0;
int num_processes = 0;

- igt_skip_on_simulation();
-
igt_fixture {
uint64_t mem_size = intel_get_total_ram_mb();
unsigned int engine;
diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
index b9ff532e..e22631ab 100644
--- a/tests/i915/gem_softpin.c
+++ b/tests/i915/gem_softpin.c
@@ -480,8 +480,6 @@ igt_main
{
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_spin_batch.c b/tests/i915/gem_spin_batch.c
index e0623f4c..3222378d 100644
--- a/tests/i915/gem_spin_batch.c
+++ b/tests/i915/gem_spin_batch.c
@@ -143,8 +143,6 @@ igt_main
struct intel_execution_engine2 e2__;
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_stolen.c b/tests/i915/gem_stolen.c
index e2c52723..d6b30dcb 100644
--- a/tests/i915/gem_stolen.c
+++ b/tests/i915/gem_stolen.c
@@ -404,8 +404,6 @@ igt_main
int fd;
uint32_t devid;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
devid = intel_get_drm_devid(fd);
diff --git a/tests/i915/gem_storedw_batches_loop.c b/tests/i915/gem_storedw_batches_loop.c
index c0343ccb..65aba88a 100644
--- a/tests/i915/gem_storedw_batches_loop.c
+++ b/tests/i915/gem_storedw_batches_loop.c
@@ -130,8 +130,6 @@ int devid;

igt_main
{
- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
index 8c5aaa14..fb28e716 100644
--- a/tests/i915/gem_sync.c
+++ b/tests/i915/gem_sync.c
@@ -1214,8 +1214,6 @@ igt_main
const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_threaded_access_tiled.c b/tests/i915/gem_threaded_access_tiled.c
index 288324d4..64a00026 100644
--- a/tests/i915/gem_threaded_access_tiled.c
+++ b/tests/i915/gem_threaded_access_tiled.c
@@ -95,8 +95,6 @@ igt_simple_main
unsigned long pitch = 0;
int r;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_assert(fd >= 0);

diff --git a/tests/i915/gem_tiled_fence_blits.c b/tests/i915/gem_tiled_fence_blits.c
index ef03c73b..93c79dc2 100644
--- a/tests/i915/gem_tiled_fence_blits.c
+++ b/tests/i915/gem_tiled_fence_blits.c
@@ -219,9 +219,6 @@ igt_main
igt_subtest("basic")
run_test (fd, 2);

- /* the rest of the tests are too long for simulation */
- igt_skip_on_simulation();
-
igt_subtest("normal") {
uint64_t count;

diff --git a/tests/i915/gem_tiled_partial_pwrite_pread.c b/tests/i915/gem_tiled_partial_pwrite_pread.c
index 3d160b0f..9d15cdf1 100644
--- a/tests/i915/gem_tiled_partial_pwrite_pread.c
+++ b/tests/i915/gem_tiled_partial_pwrite_pread.c
@@ -262,8 +262,6 @@ igt_main
{
uint32_t tiling_mode = I915_TILING_X;

- igt_skip_on_simulation();
-
srandom(0xdeadbeef);

igt_fixture {
diff --git a/tests/i915/gem_unfence_active_buffers.c b/tests/i915/gem_unfence_active_buffers.c
index a357ec32..c1670dd5 100644
--- a/tests/i915/gem_unfence_active_buffers.c
+++ b/tests/i915/gem_unfence_active_buffers.c
@@ -68,8 +68,6 @@ igt_simple_main
drm_intel_bo *busy_bo, *test_bo;
uint32_t tiling = I915_TILING_X;

- igt_skip_on_simulation();
-
for (i = 0; i < 1024*256; i++)
data[i] = i;

diff --git a/tests/i915/gem_unref_active_buffers.c b/tests/i915/gem_unref_active_buffers.c
index b5d48206..2adf0f1a 100644
--- a/tests/i915/gem_unref_active_buffers.c
+++ b/tests/i915/gem_unref_active_buffers.c
@@ -54,8 +54,6 @@ igt_simple_main
{
int fd, i;

- igt_skip_on_simulation();
-
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
gem_require_blitter(fd);
diff --git a/tests/i915/gem_wait.c b/tests/i915/gem_wait.c
index b5e32219..71f8bb5a 100644
--- a/tests/i915/gem_wait.c
+++ b/tests/i915/gem_wait.c
@@ -137,8 +137,6 @@ igt_main
const struct intel_execution_engine2 *e;
int fd = -1;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver_master(DRIVER_INTEL);
igt_require_gem(fd);
diff --git a/tests/i915/gem_write_read_ring_switch.c b/tests/i915/gem_write_read_ring_switch.c
index ef229cc5..a9d0a8ed 100644
--- a/tests/i915/gem_write_read_ring_switch.c
+++ b/tests/i915/gem_write_read_ring_switch.c
@@ -149,8 +149,6 @@ igt_main
};
int i;

- igt_skip_on_simulation();
-
igt_fixture {
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);
--
2.23.0