diff --git a/0001-add-loongarch-support.patch b/0001-add-loongarch64-support-for-ucx.patch similarity index 85% rename from 0001-add-loongarch-support.patch rename to 0001-add-loongarch64-support-for-ucx.patch index 75763598ee54757989c0f423cb6d2c52f80817e9..d4a4df529f17ea147fe070500b7bbc38c05e135c 100644 --- a/0001-add-loongarch-support.patch +++ b/0001-add-loongarch64-support-for-ucx.patch @@ -1,7 +1,8 @@ -From 3d42367752caab31a439f221dc216e9aa2cebd88 Mon Sep 17 00:00:00 2001 -From: Jingyun Hua -Date: Thu, 27 Jul 2023 01:59:57 +0000 -Subject: [PATCH] add loongarch support +From 17c06e6237067219e88ac7d43e962a1a0e46bbb4 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang + liuzhilin +Date: Thu, 11 Jan 2024 08:32:58 +0000 +Subject: [PATCH] add loongarch64 support for ucx --- config.guess | 3 + @@ -9,7 +10,7 @@ Subject: [PATCH] add loongarch support src/ucm/Makefile.in | 19 ++++- src/ucm/bistro/bistro.c | 2 +- src/ucm/bistro/bistro.h | 2 + - src/ucm/bistro/bistro_loongarch64.c | 81 ++++++++++++++++++++ + src/ucm/bistro/bistro_loongarch64.c | 85 +++++++++++++++++++++ src/ucm/bistro/bistro_loongarch64.h | 46 +++++++++++ src/ucs/Makefile.am | 4 + src/ucs/Makefile.in | 33 +++++++- @@ -21,7 +22,7 @@ Subject: [PATCH] add loongarch support src/ucs/arch/loongarch64/cpu.h | 101 +++++++++++++++++++++++++ src/ucs/arch/loongarch64/global_opts.c | 24 ++++++ src/ucs/arch/loongarch64/global_opts.h | 24 ++++++ - 17 files changed, 384 insertions(+), 7 deletions(-) + 17 files changed, 388 insertions(+), 7 deletions(-) create mode 100644 src/ucm/bistro/bistro_loongarch64.c create mode 100644 src/ucm/bistro/bistro_loongarch64.h create mode 100644 src/ucs/arch/loongarch64/bitops.h @@ -30,7 +31,7 @@ Subject: [PATCH] add loongarch support create mode 100644 src/ucs/arch/loongarch64/global_opts.h diff --git a/config.guess b/config.guess -index b79252d..87fc200 100755 +index b79252d..74933dc 100755 --- a/config.guess +++ b/config.guess @@ -883,6 +883,9 @@ EOF @@ -38,13 +39,13 @@ index b79252d..87fc200 100755 echo ${UNAME_MACHINE}-pc-minix exit ;; + loongarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; aarch64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; diff --git a/src/ucm/Makefile.am b/src/ucm/Makefile.am -index 5140b5a..e2f53b7 100644 +index 48b82bf..75b9821 100644 --- a/src/ucm/Makefile.am +++ b/src/ucm/Makefile.am @@ -31,6 +31,7 @@ noinst_HEADERS = \ @@ -64,10 +65,10 @@ index 5140b5a..e2f53b7 100644 if HAVE_UCM_PTMALLOC286 diff --git a/src/ucm/Makefile.in b/src/ucm/Makefile.in -index b83d07b..3202d87 100644 +index 1dd6749..7cc43f5 100644 --- a/src/ucm/Makefile.in +++ b/src/ucm/Makefile.in -@@ -192,7 +192,7 @@ am__libucm_la_SOURCES_DIST = event/event.c malloc/malloc_hook.c \ +@@ -191,7 +191,7 @@ am__libucm_la_SOURCES_DIST = event/event.c malloc/malloc_hook.c \ mmap/install.c util/replace.c util/log.c util/reloc.c \ util/sys.c bistro/bistro.c bistro/bistro_x86_64.c \ bistro/bistro_aarch64.c bistro/bistro_ppc64.c \ @@ -76,7 +77,7 @@ index b83d07b..3202d87 100644 am__dirstamp = $(am__leading_dot)dirstamp @HAVE_UCM_PTMALLOC286_TRUE@am__objects_1 = \ @HAVE_UCM_PTMALLOC286_TRUE@ ptmalloc286/libucm_la-malloc.lo -@@ -202,6 +202,7 @@ am_libucm_la_OBJECTS = event/libucm_la-event.lo \ +@@ -201,6 +201,7 @@ am_libucm_la_OBJECTS = event/libucm_la-event.lo \ util/libucm_la-reloc.lo util/libucm_la-sys.lo \ bistro/libucm_la-bistro.lo bistro/libucm_la-bistro_x86_64.lo \ bistro/libucm_la-bistro_aarch64.lo \ @@ -84,7 +85,7 @@ index b83d07b..3202d87 100644 bistro/libucm_la-bistro_ppc64.lo $(am__objects_1) libucm_la_OBJECTS = $(am_libucm_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) -@@ -265,7 +266,7 @@ am__noinst_HEADERS_DIST = event/event.h malloc/malloc_hook.h \ +@@ -264,7 +265,7 @@ am__noinst_HEADERS_DIST = event/event.h malloc/malloc_hook.h \ util/replace.h util/log.h util/reloc.h util/sys.h \ bistro/bistro_int.h bistro/bistro.h bistro/bistro_x86_64.h \ bistro/bistro_aarch64.h bistro/bistro_ppc64.h \ @@ -112,7 +113,7 @@ index b83d07b..3202d87 100644 bistro/libucm_la-bistro_aarch64.lo: bistro/$(am__dirstamp) \ bistro/$(DEPDIR)/$(am__dirstamp) +bistro/libucm_la-bistro_loongarch64.lo: bistro/$(am__dirstamp) \ -+ bistro/$(DEPDIR)/$(am__dirstamp) ++ bistro/$(DEPDIR)/$(am__dirstamp) bistro/libucm_la-bistro_ppc64.lo: bistro/$(am__dirstamp) \ bistro/$(DEPDIR)/$(am__dirstamp) ptmalloc286/$(am__dirstamp): @@ -129,20 +130,20 @@ index b83d07b..3202d87 100644 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucm_la_CPPFLAGS) $(CPPFLAGS) $(libucm_la_CFLAGS) $(CFLAGS) -c -o bistro/libucm_la-bistro_aarch64.lo `test -f 'bistro/bistro_aarch64.c' || echo '$(srcdir)/'`bistro/bistro_aarch64.c +bistro/libucm_la-bistro_loongarch64.lo: bistro/bistro_loongarch64.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucm_la_CPPFLAGS) $(CPPFLAGS) $(libucm_la_CFLAGS) $(CFLAGS) -MT bistro/libucm_la-bistro_loongarch64.lo -MD -MP -MF bistro/$(DEPDIR)/libucm_la-bistro_loongarch64.Tpo -c -o bistro/libucm_la-bistro_loongarch64.lo `test -f 'bistro/bistro_loongarch64.c' || echo '$(srcdir)/'`bistro/bistro_loongarch64.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) bistro/$(DEPDIR)/libucm_la-bistro_loongarch64.Tpo bistro/$(DEPDIR)/libucm_la-bistro_loongarch64.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bistro/bistro_loongarch64.c' object='bistro/libucm_la-bistro_loongarch64.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucm_la_CPPFLAGS) $(CPPFLAGS) $(libucm_la_CFLAGS) $(CFLAGS) -MT bistro/libucm_la-bistro_loongarch64.lo -MD -MP -MF bistro/$(DEPDIR)/libucm_la-bistro_loongarch64.Tpo -c -o bistro/libucm_la-bistro_loongarch64.lo `test -f 'bistro/bistro_loongarch64.c' || echo '$(srcdir)/'`bistro/bistro_loongarch64.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) bistro/$(DEPDIR)/libucm_la-bistro_loongarch64.Tpo bistro/$(DEPDIR)/libucm_la-bistro_loongarch64.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='bistro/bistro_loongarch64.c' object='bistro/libucm_la-bistro_loongarch64.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucm_la_CPPFLAGS) $(CPPFLAGS) $(libucm_la_CFLAGS) $(CFLAGS) -c -o bistro/libucm_la-bistro_loongarch64.lo `test -f 'bistro/bistro_loongarch64.c' || echo '$(srcdir)/'`bistro/bistro_loongarch64.c + bistro/libucm_la-bistro_ppc64.lo: bistro/bistro_ppc64.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucm_la_CPPFLAGS) $(CPPFLAGS) $(libucm_la_CFLAGS) $(CFLAGS) -MT bistro/libucm_la-bistro_ppc64.lo -MD -MP -MF bistro/$(DEPDIR)/libucm_la-bistro_ppc64.Tpo -c -o bistro/libucm_la-bistro_ppc64.lo `test -f 'bistro/bistro_ppc64.c' || echo '$(srcdir)/'`bistro/bistro_ppc64.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) bistro/$(DEPDIR)/libucm_la-bistro_ppc64.Tpo bistro/$(DEPDIR)/libucm_la-bistro_ppc64.Plo diff --git a/src/ucm/bistro/bistro.c b/src/ucm/bistro/bistro.c -index c31741a..ca8fb8a 100644 +index acc62fd..e7ae23f 100644 --- a/src/ucm/bistro/bistro.c +++ b/src/ucm/bistro/bistro.c -@@ -62,7 +62,7 @@ ucs_status_t ucm_bistro_apply_patch(void *dst, void *patch, size_t len) +@@ -63,7 +63,7 @@ ucs_status_t ucm_bistro_apply_patch(void *dst, void *patch, size_t len) return status; } @@ -152,7 +153,7 @@ index c31741a..ca8fb8a 100644 void *addr; /* address of function to restore */ size_t patch_len; /* patch length */ diff --git a/src/ucm/bistro/bistro.h b/src/ucm/bistro/bistro.h -index 1010004..f4d1662 100644 +index b622e3c..4b0bfbb 100644 --- a/src/ucm/bistro/bistro.h +++ b/src/ucm/bistro/bistro.h @@ -20,6 +20,8 @@ typedef struct ucm_bistro_restore_point ucm_bistro_restore_point_t; @@ -166,10 +167,10 @@ index 1010004..f4d1662 100644 #endif diff --git a/src/ucm/bistro/bistro_loongarch64.c b/src/ucm/bistro/bistro_loongarch64.c new file mode 100644 -index 0000000..0e1fbff +index 0000000..5c62717 --- /dev/null +++ b/src/ucm/bistro/bistro_loongarch64.c -@@ -0,0 +1,81 @@ +@@ -0,0 +1,85 @@ +/** + * Copyright (C) Mellanox Technologies Ltd. 2018. ALL RIGHTS RESERVED. + * @@ -250,6 +251,10 @@ index 0000000..0e1fbff + return ucm_bistro_apply_patch(func_ptr, &patch, sizeof(patch)); +} + ++ucs_status_t ucm_bistro_relocate_one(ucm_bistro_relocate_context_t *ctx) ++{ ++ return UCS_ERR_UNSUPPORTED; ++} +#endif diff --git a/src/ucm/bistro/bistro_loongarch64.h b/src/ucm/bistro/bistro_loongarch64.h new file mode 100644 @@ -304,18 +309,18 @@ index 0000000..bbc6c0f + +#endif diff --git a/src/ucs/Makefile.am b/src/ucs/Makefile.am -index 7768002..d893f3c 100644 +index 9e0bd2f..cf39678 100644 --- a/src/ucs/Makefile.am +++ b/src/ucs/Makefile.am -@@ -21,6 +21,7 @@ libucs_la_LIBADD = $(LIBM) $(top_builddir)/src/ucm/libucm.la $(BFD_LIBS) - +@@ -22,6 +22,7 @@ libucs_la_LIBADD = $(LIBM) $(top_builddir)/src/ucm/libucm.la $(BFD_LIBS) nobase_dist_libucs_la_HEADERS = \ arch/aarch64/bitops.h \ -+ arch/loongarch64/bitops.h \ arch/ppc64/bitops.h \ ++ arch/loongarch64/bitops.h \ arch/x86_64/bitops.h \ arch/bitops.h \ -@@ -79,12 +80,14 @@ nobase_dist_libucs_la_HEADERS = \ + algorithm/crc.h \ +@@ -80,12 +81,14 @@ nobase_dist_libucs_la_HEADERS = \ arch/x86_64/global_opts.h \ arch/x86_64/atomic.h \ arch/aarch64/global_opts.h \ @@ -330,8 +335,8 @@ index 7768002..d893f3c 100644 arch/generic/cpu.h \ arch/ppc64/cpu.h \ arch/x86_64/cpu.h \ -@@ -134,6 +137,7 @@ libucs_la_SOURCES = \ - algorithm/qsort_r.c \ +@@ -138,6 +141,7 @@ libucs_la_SOURCES = \ + algorithm/string_distance.c \ arch/aarch64/cpu.c \ arch/aarch64/global_opts.c \ + arch/loongarch64/global_opts.c \ @@ -339,26 +344,26 @@ index 7768002..d893f3c 100644 arch/ppc64/global_opts.c \ arch/x86_64/cpu.c \ diff --git a/src/ucs/Makefile.in b/src/ucs/Makefile.in -index 34fcd02..54855dd 100644 +index 053d70a..5cb387e 100644 --- a/src/ucs/Makefile.in +++ b/src/ucs/Makefile.in @@ -202,6 +202,7 @@ am__libucs_la_SOURCES_DIST = algorithm/crc.c algorithm/qsort_r.c \ - arch/aarch64/cpu.c arch/aarch64/global_opts.c \ - arch/ppc64/timebase.c arch/ppc64/global_opts.c \ - arch/x86_64/cpu.c arch/x86_64/global_opts.c arch/cpu.c \ + arch/aarch64/global_opts.c arch/ppc64/timebase.c \ + arch/ppc64/global_opts.c arch/x86_64/cpu.c \ + arch/x86_64/global_opts.c arch/cpu.c async/async.c \ + arch/loongarch64/global_opts.c \ - async/async.c async/signal.c async/pipe.c async/thread.c \ + async/signal.c async/pipe.c async/eventfd.c async/thread.c \ config/global_opts.c config/ucm_opts.c config/ini.c \ config/parser.c datastruct/arbiter.c datastruct/array.c \ -@@ -229,6 +230,7 @@ am__dirstamp = $(am__leading_dot)dirstamp - am_libucs_la_OBJECTS = algorithm/libucs_la-crc.lo \ - algorithm/libucs_la-qsort_r.lo arch/aarch64/libucs_la-cpu.lo \ +@@ -231,6 +232,7 @@ am_libucs_la_OBJECTS = algorithm/libucs_la-crc.lo \ + algorithm/libucs_la-string_distance.lo \ + arch/aarch64/libucs_la-cpu.lo \ arch/aarch64/libucs_la-global_opts.lo \ + arch/loongarch64/libucs_la-global_opts.lo \ arch/ppc64/libucs_la-timebase.lo \ arch/ppc64/libucs_la-global_opts.lo \ arch/x86_64/libucs_la-cpu.lo \ -@@ -639,6 +641,7 @@ libucs_ladir = $(includedir)/ucs +@@ -643,6 +645,7 @@ libucs_ladir = $(includedir)/ucs libucs_la_LIBADD = $(LIBM) $(top_builddir)/src/ucm/libucm.la $(BFD_LIBS) nobase_dist_libucs_la_HEADERS = \ arch/aarch64/bitops.h \ @@ -366,7 +371,7 @@ index 34fcd02..54855dd 100644 arch/ppc64/bitops.h \ arch/x86_64/bitops.h \ arch/bitops.h \ -@@ -697,12 +700,14 @@ nobase_dist_libucs_la_HEADERS = \ +@@ -702,12 +705,14 @@ nobase_dist_libucs_la_HEADERS = \ arch/x86_64/global_opts.h \ arch/x86_64/atomic.h \ arch/aarch64/global_opts.h \ @@ -381,15 +386,15 @@ index 34fcd02..54855dd 100644 arch/generic/cpu.h \ arch/ppc64/cpu.h \ arch/x86_64/cpu.h \ -@@ -751,6 +756,7 @@ libucs_la_SOURCES = algorithm/crc.c algorithm/qsort_r.c \ - arch/aarch64/cpu.c arch/aarch64/global_opts.c \ - arch/ppc64/timebase.c arch/ppc64/global_opts.c \ - arch/x86_64/cpu.c arch/x86_64/global_opts.c arch/cpu.c \ +@@ -759,6 +764,7 @@ libucs_la_SOURCES = algorithm/crc.c algorithm/qsort_r.c \ + arch/aarch64/global_opts.c arch/ppc64/timebase.c \ + arch/ppc64/global_opts.c arch/x86_64/cpu.c \ + arch/x86_64/global_opts.c arch/cpu.c async/async.c \ + arch/loongarch64/global_opts.c \ - async/async.c async/signal.c async/pipe.c async/thread.c \ + async/signal.c async/pipe.c async/eventfd.c async/thread.c \ config/global_opts.c config/ucm_opts.c config/ini.c \ config/parser.c datastruct/arbiter.c datastruct/array.c \ -@@ -868,6 +874,16 @@ arch/aarch64/libucs_la-cpu.lo: arch/aarch64/$(am__dirstamp) \ +@@ -878,6 +884,16 @@ arch/aarch64/libucs_la-cpu.lo: arch/aarch64/$(am__dirstamp) \ arch/aarch64/$(DEPDIR)/$(am__dirstamp) arch/aarch64/libucs_la-global_opts.lo: arch/aarch64/$(am__dirstamp) \ arch/aarch64/$(DEPDIR)/$(am__dirstamp) @@ -406,7 +411,7 @@ index 34fcd02..54855dd 100644 arch/ppc64/$(am__dirstamp): @$(MKDIR_P) arch/ppc64 @: > arch/ppc64/$(am__dirstamp) -@@ -1152,6 +1168,8 @@ mostlyclean-compile: +@@ -1164,6 +1180,8 @@ mostlyclean-compile: -rm -f arch/*.lo -rm -f arch/aarch64/*.$(OBJEXT) -rm -f arch/aarch64/*.lo @@ -415,7 +420,7 @@ index 34fcd02..54855dd 100644 -rm -f arch/ppc64/*.$(OBJEXT) -rm -f arch/ppc64/*.lo -rm -f arch/x86_64/*.$(OBJEXT) -@@ -1190,6 +1208,7 @@ distclean-compile: +@@ -1203,6 +1221,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@arch/aarch64/$(DEPDIR)/libucs_la-cpu.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arch/aarch64/$(DEPDIR)/libucs_la-global_opts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arch/aarch64/$(DEPDIR)/libucs_la-memcpy_thunderx2.Plo@am__quote@ @@ -423,21 +428,21 @@ index 34fcd02..54855dd 100644 @AMDEP_TRUE@@am__include@ @am__quote@arch/ppc64/$(DEPDIR)/libucs_la-global_opts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arch/ppc64/$(DEPDIR)/libucs_la-timebase.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arch/x86_64/$(DEPDIR)/libucs_la-cpu.Plo@am__quote@ -@@ -1336,6 +1355,13 @@ arch/aarch64/libucs_la-global_opts.lo: arch/aarch64/global_opts.c +@@ -1357,6 +1376,13 @@ arch/aarch64/libucs_la-global_opts.lo: arch/aarch64/global_opts.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucs_la_CPPFLAGS) $(CPPFLAGS) $(libucs_la_CFLAGS) $(CFLAGS) -c -o arch/aarch64/libucs_la-global_opts.lo `test -f 'arch/aarch64/global_opts.c' || echo '$(srcdir)/'`arch/aarch64/global_opts.c +arch/loongarch64/libucs_la-global_opts.lo: arch/loongarch64/global_opts.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucs_la_CPPFLAGS) $(CPPFLAGS) $(libucs_la_CFLAGS) $(CFLAGS) -MT arch/loongarch64/libucs_la-global_opts.lo -MD -MP -MF arch/loongarch64/$(DEPDIR)/libucs_la-global_opts.Tpo -c -o arch/loongarch64/libucs_la-global_opts.lo `test -f 'arch/loongarch64/global_opts.c' || echo '$(srcdir)/'`arch/loongarch64/global_opts.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) arch/loongarch64/$(DEPDIR)/libucs_la-global_opts.Tpo arch/loongarch64/$(DEPDIR)/libucs_la-global_opts.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='arch/loongarch64/global_opts.c' object='arch/loongarch64/libucs_la-global_opts.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucs_la_CPPFLAGS) $(CPPFLAGS) $(libucs_la_CFLAGS) $(CFLAGS) -MT arch/loongarch64/libucs_la-global_opts.lo -MD -MP -MF arch/loongarch64/$(DEPDIR)/libucs_la-global_opts.Tpo -c -o arch/loongarch64/libucs_la-global_opts.lo `test -f 'arch/loongarch64/global_opts.c' || echo '$(srcdir)/'`arch/loongarch64/global_opts.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) arch/loongarch64/$(DEPDIR)/libucs_la-global_opts.Tpo arch/loongarch64/$(DEPDIR)/libucs_la-global_opts.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='arch/loongarch64/global_opts.c' object='arch/loongarch64/libucs_la-global_opts.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucs_la_CPPFLAGS) $(CPPFLAGS) $(libucs_la_CFLAGS) $(CFLAGS) -c -o arch/loongarch64/libucs_la-global_opts.lo `test -f 'arch/loongarch64/global_opts.c' || echo '$(srcdir)/'`arch/loongarch64/global_opts.c + arch/ppc64/libucs_la-timebase.lo: arch/ppc64/timebase.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libucs_la_CPPFLAGS) $(CPPFLAGS) $(libucs_la_CFLAGS) $(CFLAGS) -MT arch/ppc64/libucs_la-timebase.lo -MD -MP -MF arch/ppc64/$(DEPDIR)/libucs_la-timebase.Tpo -c -o arch/ppc64/libucs_la-timebase.lo `test -f 'arch/ppc64/timebase.c' || echo '$(srcdir)/'`arch/ppc64/timebase.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) arch/ppc64/$(DEPDIR)/libucs_la-timebase.Tpo arch/ppc64/$(DEPDIR)/libucs_la-timebase.Plo -@@ -1792,6 +1818,7 @@ clean-libtool: +@@ -1820,6 +1846,7 @@ clean-libtool: -rm -rf algorithm/.libs algorithm/_libs -rm -rf arch/.libs arch/_libs -rm -rf arch/aarch64/.libs arch/aarch64/_libs @@ -445,7 +450,7 @@ index 34fcd02..54855dd 100644 -rm -rf arch/ppc64/.libs arch/ppc64/_libs -rm -rf arch/x86_64/.libs arch/x86_64/_libs -rm -rf async/.libs async/_libs -@@ -2049,6 +2076,8 @@ distclean-generic: +@@ -2077,6 +2104,8 @@ distclean-generic: -rm -f arch/$(am__dirstamp) -rm -f arch/aarch64/$(DEPDIR)/$(am__dirstamp) -rm -f arch/aarch64/$(am__dirstamp) @@ -454,7 +459,7 @@ index 34fcd02..54855dd 100644 -rm -f arch/ppc64/$(DEPDIR)/$(am__dirstamp) -rm -f arch/ppc64/$(am__dirstamp) -rm -f arch/x86_64/$(DEPDIR)/$(am__dirstamp) -@@ -2087,7 +2116,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ +@@ -2115,7 +2144,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-recursive @@ -463,7 +468,7 @@ index 34fcd02..54855dd 100644 -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -@@ -2134,7 +2163,7 @@ install-ps-am: +@@ -2162,7 +2191,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -473,7 +478,7 @@ index 34fcd02..54855dd 100644 maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/src/ucs/arch/atomic.h b/src/ucs/arch/atomic.h -index 6a8551f..2fad8d4 100644 +index 52be711..6b53cb3 100644 --- a/src/ucs/arch/atomic.h +++ b/src/ucs/arch/atomic.h @@ -15,6 +15,8 @@ @@ -486,7 +491,7 @@ index 6a8551f..2fad8d4 100644 # error "Unsupported architecture" #endif diff --git a/src/ucs/arch/bitops.h b/src/ucs/arch/bitops.h -index 77e0057..09e68e6 100644 +index e89a37d..7047a46 100644 --- a/src/ucs/arch/bitops.h +++ b/src/ucs/arch/bitops.h @@ -20,6 +20,8 @@ BEGIN_C_DECLS @@ -499,7 +504,7 @@ index 77e0057..09e68e6 100644 # error "Unsupported architecture" #endif diff --git a/src/ucs/arch/cpu.h b/src/ucs/arch/cpu.h -index 719913f..cf6e4de 100644 +index a59561c..727ffc8 100644 --- a/src/ucs/arch/cpu.h +++ b/src/ucs/arch/cpu.h @@ -98,6 +98,8 @@ typedef struct ucs_cpu_builtin_memcpy { @@ -512,7 +517,7 @@ index 719913f..cf6e4de 100644 # error "Unsupported architecture" #endif diff --git a/src/ucs/arch/global_opts.h b/src/ucs/arch/global_opts.h -index 8786f13..28753ef 100644 +index 75d0861..c8ad5b8 100644 --- a/src/ucs/arch/global_opts.h +++ b/src/ucs/arch/global_opts.h @@ -15,6 +15,8 @@ @@ -574,7 +579,7 @@ index 0000000..86ad7f1 +#endif diff --git a/src/ucs/arch/loongarch64/cpu.h b/src/ucs/arch/loongarch64/cpu.h new file mode 100644 -index 0000000..4f3223e +index 0000000..51b153b --- /dev/null +++ b/src/ucs/arch/loongarch64/cpu.h @@ -0,0 +1,101 @@ diff --git a/download b/download index 2bd29468b10b61cb8e30cd5c2255db7a085e189d..552e7a6a0dce749a51e9469230c78bbe9ced021c 100644 --- a/download +++ b/download @@ -1 +1 @@ -b94e0ae7466126a99dbcd76f49270721 ucx-1.13.1.tar.gz +3dbdd26e95af9713e3101fffaf67a647 ucx-1.14.1.tar.gz diff --git a/ucx.spec b/ucx.spec index 30cbc44630466276486cd8b48e14a32f940c886e..a2e27c329dcf396c3c77f0f947847f07ffbc00d0 100644 --- a/ucx.spec +++ b/ucx.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 %{!?configure_options: %global configure_options %{nil}} %bcond_without cma %bcond_with cuda @@ -17,14 +17,15 @@ %bcond_with vfs Name: ucx -Version: 1.13.1 -Release: 2%{anolis_release}%{?dist} +Version: 1.14.1 +Release: 1%{anolis_release}%{?dist}.1 Summary: UCX is a communication library implementing high-performance messaging License: BSD URL: http://www.openucx.org Source: https://github.com/openucx/%{name}/releases/download/v%{version}/ucx-%{version}.tar.gz -Patch0: 0001-add-loongarch-support.patch + +Patch0001: 0001-add-loongarch64-support-for-ucx.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Prefix: %{_prefix} @@ -93,8 +94,7 @@ Provides header files and examples for developing with UCX. %prep %setup -q -%patch0 -p1 - +%patch0001 -p1 %build %define _with_arg() %{expand:%%{?with_%{1}:--with-%{2}}%%{!?with_%{1}:--without-%{2}}} %define _enable_arg() %{expand:%%{?with_%{1}:--enable-%{2}}%%{!?with_%{1}:--disable-%{2}}} @@ -237,7 +237,7 @@ for large messages. %if %{with rdmacm} %package rdmacm -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-ib%{?_isa} = %{version}-%{release} Summary: UCX RDMA connection manager support %description rdmacm @@ -314,6 +314,10 @@ library internals, protocol objects, transports status, and more. %endif %changelog +* Thu Jan 11 2024 Wenlong Zhang - 1.14.1-1.0.1 +- Update to 1.14.1 + Add loongarch64 support for ucx + * Thu Jul 27 2023 Jingyun Hua - 1.13.1-2.0.2 - Fix build error on loongarch64