X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fmeson.build;h=81cbe0381feba9e57e995502ada6271c20b67d06;hb=53a80512644c8a12cb8efc903f77dd7b42263565;hp=117c7534892d48faab9f6988b7b3a1a6ac6cbe5f;hpb=4ad4b20a79052d9c8062b64eaf0170c16a333ff8;p=dpdk.git

diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 117c753489..81cbe0381f 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -9,9 +9,18 @@ if is_windows
 endif
 
 headers = files('rte_pmd_bnxt.h')
+cflags_options = [
+        '-DRTE_LIBRTE_BNXT_TF',
+        '-DSUPPORT_CFA_HW_ALL=1',
+]
 
-includes += include_directories('tf_ulp')
-includes += include_directories('tf_core')
+foreach option:cflags_options
+        if cc.has_argument(option)
+                cflags += option
+        endif
+endforeach
+
+headers = files('rte_pmd_bnxt.h')
 
 sources = files(
         'bnxt_cpr.c',
@@ -30,58 +39,33 @@ sources = files(
         'bnxt_vnic.c',
         'bnxt_reps.c',
 
-        'tf_core/tf_core.c',
-        'tf_core/bitalloc.c',
-        'tf_core/tf_msg.c',
-        'tf_core/rand.c',
-        'tf_core/stack.c',
-        'tf_core/tf_em_common.c',
-        'tf_core/tf_em_internal.c',
-        'tf_core/tf_rm.c',
-        'tf_core/tf_tbl.c',
-        'tf_core/tfp.c',
-        'tf_core/tf_session.c',
-        'tf_core/tf_device.c',
-        'tf_core/tf_device_p4.c',
-        'tf_core/tf_identifier.c',
-        'tf_core/tf_shadow_tbl.c',
-        'tf_core/tf_shadow_tcam.c',
-        'tf_core/tf_tcam.c',
-        'tf_core/tf_util.c',
-        'tf_core/tf_if_tbl.c',
-        'tf_core/ll.c',
-        'tf_core/tf_global_cfg.c',
-        'tf_core/tf_em_host.c',
-        'tf_core/tf_shadow_identifier.c',
-        'tf_core/tf_hash.c',
-
-        'hcapi/hcapi_cfa_p4.c',
-
-        'tf_ulp/bnxt_ulp.c',
-        'tf_ulp/ulp_mark_mgr.c',
-        'tf_ulp/ulp_flow_db.c',
-        'tf_ulp/ulp_template_db_tbl.c',
-        'tf_ulp/ulp_template_db_class.c',
-        'tf_ulp/ulp_template_db_act.c',
-        'tf_ulp/ulp_utils.c',
-        'tf_ulp/ulp_mapper.c',
-        'tf_ulp/ulp_matcher.c',
-        'tf_ulp/ulp_rte_parser.c',
-        'tf_ulp/bnxt_ulp_flow.c',
-        'tf_ulp/ulp_port_db.c',
-        'tf_ulp/ulp_def_rules.c',
-        'tf_ulp/ulp_fc_mgr.c',
-        'tf_ulp/ulp_tun.c',
-        'tf_ulp/ulp_template_db_wh_plus_act.c',
-        'tf_ulp/ulp_template_db_wh_plus_class.c',
-        'tf_ulp/ulp_template_db_stingray_act.c',
-        'tf_ulp/ulp_template_db_stingray_class.c',
-
         'rte_pmd_bnxt.c',
 )
 
+#Add the subdirectories that need to be compiled
+subdir('tf_ulp')
+subdir('tf_core')
+subdir('hcapi/cfa')
+
 if arch_subdir == 'x86'
     sources += files('bnxt_rxtx_vec_sse.c')
-elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+            cflags += ['-DCC_AVX2_SUPPORT']
+            sources += files('bnxt_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+            cflags += ['-DCC_AVX2_SUPPORT']
+            bnxt_avx2_lib = static_library('bnxt_avx2_lib',
+                            'bnxt_rxtx_vec_avx2.c',
+                            dependencies: [static_rte_ethdev,
+                                    static_rte_bus_pci,
+                                    static_rte_kvargs, static_rte_hash],
+                            include_directories: includes,
+                            c_args: [cflags, '-mavx2'])
+            objs += bnxt_avx2_lib.extract_objects('bnxt_rxtx_vec_avx2.c')
+     endif
+elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
     sources += files('bnxt_rxtx_vec_neon.c')
 endif