Re: [Intel-gfx] [PATCH i-g-t 1/2] igt: Remove Android support
On Fri, 2017-11-24 at 17:17 +0200, Arkadiusz Hiler wrote: > This patch gets rid of the Android support, deleting all the hacks and > moving code around to the places it belongs. > > Android build is not really maintained properly and rots rather fast. > With recent push for Meson here and Android going for Soong it will only > accelerate. > > It's a good time to drop the illusion of providing any support. > > Cc: Daniel Vetter> Cc: Kalyan Kondapally > Cc: Petri Latvala > Cc: Radoslaw Szwichtenberg > Signed-off-by: Arkadiusz Hiler Reviewed-by: Radoslaw Szwichtenberg ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH i-g-t 1/2] igt: Remove Android support
On 24.11.2017 17:17, Arkadiusz Hiler wrote: This patch gets rid of the Android support, deleting all the hacks and moving code around to the places it belongs. Android build is not really maintained properly and rots rather fast. With recent push for Meson here and Android going for Soong it will only accelerate. It's a good time to drop the illusion of providing any support. Cc: Daniel VetterCc: Kalyan Kondapally Cc: Petri Latvala Cc: Radoslaw Szwichtenberg Signed-off-by: Arkadiusz Hiler --- Android.mk | 4 -- assembler/ralloc.c | 5 --- benchmarks/Android.mk| 46 - benchmarks/gem_syslatency.c | 2 - lib/Android.mk | 53 lib/drmtest.h| 16 lib/igt_aux.c| 95 lib/igt_aux.h| 5 --- lib/igt_core.c | 68 --- lib/igt_debugfs.c| 25 +--- lib/igt_fb.h | 7 lib/igt_kmod.h | 4 -- lib/igt_kms.c| 89 + lib/tests/Android.mk | 41 --- tests/Android.mk | 83 -- tests/core_get_client_auth.c | 4 +- tests/gem_exec_nop.c | 4 -- tools/Android.mk | 82 -- 18 files changed, 91 insertions(+), 542 deletions(-) delete mode 100644 Android.mk delete mode 100644 benchmarks/Android.mk delete mode 100644 lib/Android.mk delete mode 100644 lib/tests/Android.mk delete mode 100644 tests/Android.mk delete mode 100644 tools/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 3690fc5a.. --- a/Android.mk +++ /dev/null @@ -1,4 +0,0 @@ -HAVE_LIBDRM_INTEL := true - -include $(call all-named-subdir-makefiles, lib tests tools benchmarks) - diff --git a/assembler/ralloc.c b/assembler/ralloc.c index 59e71c48..69c1da4d 100644 --- a/assembler/ralloc.c +++ b/assembler/ralloc.c @@ -28,11 +28,6 @@ #include #include -/* Android defines SIZE_MAX in limits.h, instead of the standard stdint.h */ -#ifdef ANDROID -#include -#endif - /* Some versions of MinGW are missing _vscprintf's declaration, although they * still provide the symbol in the import library. */ #ifdef __MINGW32__ diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk deleted file mode 100644 index 4ea275c4.. --- a/benchmarks/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib - -## - -define add_benchmark -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $1.c - -LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} \ - $(LOCAL_PATH)/../lib/stubs/drm/ -LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" -LOCAL_CFLAGS += -std=gnu99 -# FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit -LOCAL_CFLAGS += -Wno-error=return-type -# Excessive complaining for established cases. Rely on the Linux version warnings. -LOCAL_CFLAGS += -Wno-sign-compare -LOCAL_LDFLAGS += -lkmod - -LOCAL_MODULE := $1_benchmark -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt/benchmarks - -LOCAL_STATIC_LIBRARIES := libintel_gpu_tools - -LOCAL_SHARED_LIBRARIES := libpciaccess \ - libkmod \ - libdrm\ - libdrm_intel - -include $(BUILD_EXECUTABLE) -endef - -## - -benchmark_list := $(benchmarks_prog_list) - -ifeq ($(HAVE_LIBDRM_INTEL),true) -benchmark_list += $(LIBDRM_INTEL_BENCHMARKS) -endif - -$(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c index 580edc5f..de59eaf8 100644 --- a/benchmarks/gem_syslatency.c +++ b/benchmarks/gem_syslatency.c @@ -219,7 +219,6 @@ static void *sys_thp_alloc(void *arg) static void bind_cpu(pthread_attr_t *attr, int cpu) { #ifdef __USE_GNU -#ifndef ANDROID cpu_set_t mask; if (cpu == -1) @@ -230,7 +229,6 @@ static void bind_cpu(pthread_attr_t *attr, int cpu) pthread_attr_setaffinity_np(attr, sizeof(mask), ); #endif -#endif } static void rtprio(pthread_attr_t *attr, int prio) diff --git a/lib/Android.mk b/lib/Android.mk deleted file mode 100644 index 31f88be7.. --- a/lib/Android.mk +++ /dev/null @@ -1,53 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -GPU_TOOLS_PATH := $(LOCAL_PATH)/.. -IGT_LIB_PATH :=
[Intel-gfx] [PATCH i-g-t 1/2] igt: Remove Android support
This patch gets rid of the Android support, deleting all the hacks and moving code around to the places it belongs. Android build is not really maintained properly and rots rather fast. With recent push for Meson here and Android going for Soong it will only accelerate. It's a good time to drop the illusion of providing any support. Cc: Daniel VetterCc: Kalyan Kondapally Cc: Petri Latvala Cc: Radoslaw Szwichtenberg Signed-off-by: Arkadiusz Hiler --- Android.mk | 4 -- assembler/ralloc.c | 5 --- benchmarks/Android.mk| 46 - benchmarks/gem_syslatency.c | 2 - lib/Android.mk | 53 lib/drmtest.h| 16 lib/igt_aux.c| 95 lib/igt_aux.h| 5 --- lib/igt_core.c | 68 --- lib/igt_debugfs.c| 25 +--- lib/igt_fb.h | 7 lib/igt_kmod.h | 4 -- lib/igt_kms.c| 89 + lib/tests/Android.mk | 41 --- tests/Android.mk | 83 -- tests/core_get_client_auth.c | 4 +- tests/gem_exec_nop.c | 4 -- tools/Android.mk | 82 -- 18 files changed, 91 insertions(+), 542 deletions(-) delete mode 100644 Android.mk delete mode 100644 benchmarks/Android.mk delete mode 100644 lib/Android.mk delete mode 100644 lib/tests/Android.mk delete mode 100644 tests/Android.mk delete mode 100644 tools/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 3690fc5a.. --- a/Android.mk +++ /dev/null @@ -1,4 +0,0 @@ -HAVE_LIBDRM_INTEL := true - -include $(call all-named-subdir-makefiles, lib tests tools benchmarks) - diff --git a/assembler/ralloc.c b/assembler/ralloc.c index 59e71c48..69c1da4d 100644 --- a/assembler/ralloc.c +++ b/assembler/ralloc.c @@ -28,11 +28,6 @@ #include #include -/* Android defines SIZE_MAX in limits.h, instead of the standard stdint.h */ -#ifdef ANDROID -#include -#endif - /* Some versions of MinGW are missing _vscprintf's declaration, although they * still provide the symbol in the import library. */ #ifdef __MINGW32__ diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk deleted file mode 100644 index 4ea275c4.. --- a/benchmarks/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib - -## - -define add_benchmark -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $1.c - -LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} \ - $(LOCAL_PATH)/../lib/stubs/drm/ -LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" -LOCAL_CFLAGS += -std=gnu99 -# FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit -LOCAL_CFLAGS += -Wno-error=return-type -# Excessive complaining for established cases. Rely on the Linux version warnings. -LOCAL_CFLAGS += -Wno-sign-compare -LOCAL_LDFLAGS += -lkmod - -LOCAL_MODULE := $1_benchmark -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt/benchmarks - -LOCAL_STATIC_LIBRARIES := libintel_gpu_tools - -LOCAL_SHARED_LIBRARIES := libpciaccess \ - libkmod \ - libdrm\ - libdrm_intel - -include $(BUILD_EXECUTABLE) -endef - -## - -benchmark_list := $(benchmarks_prog_list) - -ifeq ($(HAVE_LIBDRM_INTEL),true) -benchmark_list += $(LIBDRM_INTEL_BENCHMARKS) -endif - -$(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c index 580edc5f..de59eaf8 100644 --- a/benchmarks/gem_syslatency.c +++ b/benchmarks/gem_syslatency.c @@ -219,7 +219,6 @@ static void *sys_thp_alloc(void *arg) static void bind_cpu(pthread_attr_t *attr, int cpu) { #ifdef __USE_GNU -#ifndef ANDROID cpu_set_t mask; if (cpu == -1) @@ -230,7 +229,6 @@ static void bind_cpu(pthread_attr_t *attr, int cpu) pthread_attr_setaffinity_np(attr, sizeof(mask), ); #endif -#endif } static void rtprio(pthread_attr_t *attr, int prio) diff --git a/lib/Android.mk b/lib/Android.mk deleted file mode 100644 index 31f88be7.. --- a/lib/Android.mk +++ /dev/null @@ -1,53 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -GPU_TOOLS_PATH := $(LOCAL_PATH)/.. -IGT_LIB_PATH := $(LOCAL_PATH) - -# FIXME: autogenerate this info # -$(GPU_TOOLS_PATH)/config.h: -
[Intel-gfx] [PATCH i-g-t 1/2] igt: Remove Android support
This patch gets rid of Android support, deleting all the hacks and moving code around to the places it belong. Android build is not really maintained properly and rots rather fast. With recent push for Meson here and Android going for Soong it will only accelerate. It's a good time to drop the illusion of providing any support. If there is someone who actually needs that, please step up and help us with the maintenance. Cc: Chris WilsonCc: Daniel Vetter Cc: Kalyan Kondapally Cc: Petri Latvala Cc: Radoslaw Szwichtenberg Cc: Rafael Barbalho Signed-off-by: Arkadiusz Hiler --- Android.mk | 4 -- assembler/ralloc.c | 5 --- benchmarks/Android.mk| 46 - benchmarks/gem_syslatency.c | 2 - lib/Android.mk | 53 lib/drmtest.h| 16 lib/igt_aux.c| 95 lib/igt_aux.h| 5 --- lib/igt_core.c | 68 --- lib/igt_debugfs.c| 25 +--- lib/igt_fb.h | 7 lib/igt_kmod.h | 4 -- lib/igt_kms.c| 89 + lib/tests/Android.mk | 41 --- tests/Android.mk | 83 -- tests/core_get_client_auth.c | 4 +- tests/gem_exec_nop.c | 4 -- tools/Android.mk | 82 -- 18 files changed, 91 insertions(+), 542 deletions(-) delete mode 100644 Android.mk delete mode 100644 benchmarks/Android.mk delete mode 100644 lib/Android.mk delete mode 100644 lib/tests/Android.mk delete mode 100644 tests/Android.mk delete mode 100644 tools/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 3690fc5a.. --- a/Android.mk +++ /dev/null @@ -1,4 +0,0 @@ -HAVE_LIBDRM_INTEL := true - -include $(call all-named-subdir-makefiles, lib tests tools benchmarks) - diff --git a/assembler/ralloc.c b/assembler/ralloc.c index 59e71c48..69c1da4d 100644 --- a/assembler/ralloc.c +++ b/assembler/ralloc.c @@ -28,11 +28,6 @@ #include #include -/* Android defines SIZE_MAX in limits.h, instead of the standard stdint.h */ -#ifdef ANDROID -#include -#endif - /* Some versions of MinGW are missing _vscprintf's declaration, although they * still provide the symbol in the import library. */ #ifdef __MINGW32__ diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk deleted file mode 100644 index 4ea275c4.. --- a/benchmarks/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib - -## - -define add_benchmark -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $1.c - -LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} \ - $(LOCAL_PATH)/../lib/stubs/drm/ -LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h" -LOCAL_CFLAGS += -std=gnu99 -# FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit -LOCAL_CFLAGS += -Wno-error=return-type -# Excessive complaining for established cases. Rely on the Linux version warnings. -LOCAL_CFLAGS += -Wno-sign-compare -LOCAL_LDFLAGS += -lkmod - -LOCAL_MODULE := $1_benchmark -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt/benchmarks - -LOCAL_STATIC_LIBRARIES := libintel_gpu_tools - -LOCAL_SHARED_LIBRARIES := libpciaccess \ - libkmod \ - libdrm\ - libdrm_intel - -include $(BUILD_EXECUTABLE) -endef - -## - -benchmark_list := $(benchmarks_prog_list) - -ifeq ($(HAVE_LIBDRM_INTEL),true) -benchmark_list += $(LIBDRM_INTEL_BENCHMARKS) -endif - -$(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c index 4ed23638..994d31e0 100644 --- a/benchmarks/gem_syslatency.c +++ b/benchmarks/gem_syslatency.c @@ -183,7 +183,6 @@ static void *sys_wait(void *arg) static void bind_cpu(pthread_attr_t *attr, int cpu) { #ifdef __USE_GNU -#ifndef ANDROID cpu_set_t mask; if (cpu == -1) @@ -194,7 +193,6 @@ static void bind_cpu(pthread_attr_t *attr, int cpu) pthread_attr_setaffinity_np(attr, sizeof(mask), ); #endif -#endif } static void rtprio(pthread_attr_t *attr, int prio) diff --git a/lib/Android.mk b/lib/Android.mk deleted file mode 100644 index 31f88be7.. --- a/lib/Android.mk +++ /dev/null @@ -1,53