tests: define ALLOW_STRUCT_BY_VALUE_TEST

Modify the condition for arg_types struct-by-value test case to only
run on x86_64 with gcc.

Signed-off-by: Ihor Solodrai <[email protected]>

Author: theihor

tests/arg_types.c

@@ -122,7 +122,7 @@ const char *BPFTRACE_SCRIPT =
 	str(arg0),								\
 	*(int32 *)(arg1 + 0), *(int32 *)(arg1 + 4), *(int32 *)(arg1 + 8) }\n"
 "test:struct_by_val_reg { arg0=%hhu arg1=%u -> arg0, arg1 }\n"
-#ifndef __clang__ /* bpftrace generates a bad BPF program in this case */
+#if ALLOW_STRUCT_BY_VALUE_TEST
 "test:struct_by_val_reg_pair { s.x=%llx -> arg0 }\n" /* captures first half of a struct */
 #endif
 /* bpftrace can't handle 24-byte struct-by-value case in struct_by_val_stack */
@@ -140,7 +140,7 @@ const char *BPFTRACE_OUTPUT =
 "test:ptrs: arg0=0x* arg1='some literal' arg2=&42\n"
 "test:arrs: arg0='STRING' arg1=(-100,-200,-300)\n"
 "test:struct_by_val_reg: arg0=1 arg1=2\n"
-#ifndef __clang__
+#if ALLOW_STRUCT_BY_VALUE_TEST
 "test:struct_by_val_reg_pair: s.x=3\n"
 #endif
 "test:structs_by_ref: a=(1) b=(2) c=(3,4) d=(4,5,6)\n"

tests/common.h

@@ -8,6 +8,15 @@
 #define __always_inline inline __attribute__((always_inline))
 #endif
 
+/* Struct-by-value USDT argument currently only works on x86_64 with gcc
+ * See: https://github.com/bpftrace/bpftrace/issues/3798
+ */
+#if defined(__clang__) || defined(__aarch64__)
+  #define ALLOW_STRUCT_BY_VALUE_TEST 0
+#else
+  #define ALLOW_STRUCT_BY_VALUE_TEST 1
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

tests/cxx_arg_types.cpp

@@ -122,7 +122,7 @@ const char *BPFTRACE_SCRIPT =
 	str(arg0),								\
 	*(int32 *)(arg1 + 0), *(int32 *)(arg1 + 4), *(int32 *)(arg1 + 8) }\n"
 "test:struct_by_val_reg { arg0=%hhu arg1=%u -> arg0, arg1 }\n"
-#ifndef __clang__ /* bpftrace generates a bad BPF program in this case */
+#if ALLOW_STRUCT_BY_VALUE_TEST
 "test:struct_by_val_reg_pair { s.x=%llx -> arg0 }\n" /* captures first half of a struct */
 #endif
 /* bpftrace can't handle 24-byte struct-by-value case in struct_by_val_stack */
@@ -140,7 +140,7 @@ const char *BPFTRACE_OUTPUT =
 "test:ptrs: arg0=0x* arg1='some literal' arg2=&42\n"
 "test:arrs: arg0='STRING' arg1=(-100,-200,-300)\n"
 "test:struct_by_val_reg: arg0=1 arg1=2\n"
-#ifndef __clang__
+#if ALLOW_STRUCT_BY_VALUE_TEST
 "test:struct_by_val_reg_pair: s.x=3\n"
 #endif
 "test:structs_by_ref: a=(1) b=(2) c=(3,4) d=(4,5,6)\n"