From 24d1d8ec9e529ed66c49e17366fe5a889d483670 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 13 Dec 2017 11:43:39 -0200 Subject: Simplify tilegx sysdeps folder With tilepro support removal we can now simplify internal tile support by moving the directory structure to avoid the unnecessary directory levels in tile/tilegx both on generic and linux folders. Checked with a build for tilegx-linux-gnu and tilegx-linux-gnu-32 with and without the patch, there is no difference in generated binary with a dissassemble. * stdlib/bug-getcontext.c (do_test): Remove tilepro mention in comment. * sysdeps/tile/preconfigure: Remove tilegx folder. * sysdeps/tile/tilegx/Implies: Move definitions to ... * sysdeps/tile/Implies: ... here. * sysdeps/tile/tilegx/Makefile: Move rules to ... * sysdeps/tile/Makefile: ... here. * sysdeps/tile/tilegx/atomic-machine.h: Move definitions to ... * sysdeps/tile/atomic-machine.h: ... here. Add include guards. * sysdeps/tile/tilegx/bits/wordsize.h: Move to ... * sysdeps/tile/bits/wordsize.h: ... here. * sysdeps/tile/tilegx/*: Move to ... * sysdeps/tile/*: ... here. * sysdeps/tile/tilegx/tilegx32/Implies: Move to ... * sysdeps/tile/tilegx32/Implies: ... here. * sysdeps/tile/tilegx/tilegx64/Implies: Move to ... * sysdeps/tile/tilegx64/Implies: ... here. * sysdeps/unix/sysv/linux/tile/tilegx/Makefile: Move definitions to ... * sysdeps/unix/sysv/linux/tile/Makefile: ... here. * sysdeps/unix/sysv/linux/tile/tilegx/*: Move to ... * sysdeps/unix/sysv/linux/tile/*: ... here. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/*: Move to ... * sysdeps/unix/sysv/linux/tile/tilegx32/*: ... here. * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/*: Move to ... * sysdeps/unix/sysv/linux/tile/tilegx64/*: ... here. --- sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c | 87 ---------------------- 1 file changed, 87 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c (limited to 'sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c') diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c b/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c deleted file mode 100644 index 807913c7d1..0000000000 --- a/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c +++ /dev/null @@ -1,87 +0,0 @@ -/* Copyright (C) 2012-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#include -#include -#include -#include -#include -#include -#include - - -/* The count of cores horizontally (X dimension) on the chip. */ -static int chip_width; - -/* Read the chip "width" from the /sys filesystem. */ -static int -initialize_chip_width (void) -{ - int w = 0; - int fd; - - fd = __open ("/sys/devices/system/cpu/chip_width", O_RDONLY); - if (fd >= 0) - { - char buf[64]; - ssize_t n; - int i; - - n = __read (fd, buf, sizeof (buf)); - __close (fd); - - for (i = 0; i < n; ++i) - { - if (buf[i] < '0' || buf[i] > '9') - break; - w = (w * 10) + (buf[i] - '0'); - } - } - - /* Store a negative value so we don't try again. */ - if (w == 0) - w = -1; - - /* Using an atomic idempotent write here makes this thread-safe. */ - chip_width = w; - return w; -} - -int -sched_getcpu (void) -{ - unsigned int coord; - int w = chip_width; - - if (__builtin_expect (w <= 0, 0)) - { - if (w == 0) - w = initialize_chip_width (); - if (w < 0) - { - unsigned int cpu; - int r = INLINE_SYSCALL (getcpu, 3, &cpu, NULL, NULL); - return r == -1 ? r : cpu; - } - } - - /* Assign 64-bit value to a 32-bit variable to ensure 32-bit multiply. */ - coord = __insn_mfspr (SPR_TILE_COORD); - - /* Extract Y coord from bits 7..10 and X coord from bits 18..21. */ - return ((coord >> 7) & 0xf) * w + ((coord >> 18) & 0xf); -} -- cgit v1.2.3-70-g09d2