[1/7,libgomp,nvptx] Move generic libgomp files from nvptx to accel
diff mbox series

Message ID 59d8bd47b2b2eb94f3457b47e2c8471121b0b68f.1573560401.git.ams@codesourcery.com
State New
Headers show
Series
  • AMD GCN Offloading Support
Related show

Commit Message

Andrew Stubbs Nov. 12, 2019, 1:29 p.m. UTC
This patch shouldn't change anything much at all; it's just an internal
reorganization of files.

The idea is to move files from libgomp "nvptx" directory that have
nothing NVPTX-specific in them.  By placing them in a separate "accel"
directory they can be shared with the GCN port, thus preventing much of
the duplication.

OK to commit?

Thanks

Andrew

2019-11-12  Andrew Stubbs  <ams@codesourcery.com>

	libgomp/
	* configure.tgt (nvptx*-*-*): Add "accel" directory.
	* config/nvptx/libgomp-plugin.c: Move ...
	* config/accel/libgomp-plugin.c: ... to here.
	* config/nvptx/lock.c: Move ...
	* config/accel/lock.c: ... to here.
	* config/nvptx/mutex.c: Move ...
	* config/accel/mutex.c: ... to here.
	* config/nvptx/mutex.h: Move ...
	* config/accel/mutex.h: ... to here.
	* config/nvptx/oacc-async.c: Move ...
	* config/accel/oacc-async.c: ... to here.
	* config/nvptx/oacc-cuda.c: Move ...
	* config/accel/oacc-cuda.c: ... to here.
	* config/nvptx/oacc-host.c: Move ...
	* config/accel/oacc-host.c: ... to here.
	* config/nvptx/oacc-init.c: Move ...
	* config/accel/oacc-init.c: ... to here.
	* config/nvptx/oacc-mem.c: Move ...
	* config/accel/oacc-mem.c: ... to here.
	* config/nvptx/oacc-plugin.c: Move ...
	* config/accel/oacc-plugin.c: ... to here.
	* config/nvptx/omp-lock.h: Move ...
	* config/accel/omp-lock.h: ... to here.
	* config/nvptx/openacc.f90: Move ...
	* config/accel/openacc.f90: ... to here.
	* config/nvptx/pool.h: Move ...
	* config/accel/pool.h: ... to here.
	* config/nvptx/proc.c: Move ...
	* config/accel/proc.c: ... to here.
	* config/nvptx/ptrlock.c: Move ...
	* config/accel/ptrlock.c: ... to here.
	* config/nvptx/ptrlock.h: Move ...
	* config/accel/ptrlock.h: ... to here.
	* config/nvptx/sem.c: Move ...
	* config/accel/sem.c: ... to here.
	* config/nvptx/sem.h: Move ...
	* config/accel/sem.h: ... to here.
	* config/nvptx/thread-stacksize.h: Move ...
	* config/accel/thread-stacksize.h: ... to here.
---
 libgomp/config/{nvptx => accel}/libgomp-plugin.c   | 0
 libgomp/config/{nvptx => accel}/lock.c             | 0
 libgomp/config/{nvptx => accel}/mutex.c            | 0
 libgomp/config/{nvptx => accel}/mutex.h            | 0
 libgomp/config/{nvptx => accel}/oacc-async.c       | 0
 libgomp/config/{nvptx => accel}/oacc-cuda.c        | 0
 libgomp/config/{nvptx => accel}/oacc-host.c        | 0
 libgomp/config/{nvptx => accel}/oacc-init.c        | 0
 libgomp/config/{nvptx => accel}/oacc-mem.c         | 0
 libgomp/config/{nvptx => accel}/oacc-plugin.c      | 0
 libgomp/config/{nvptx => accel}/omp-lock.h         | 0
 libgomp/config/{nvptx => accel}/openacc.f90        | 0
 libgomp/config/{nvptx => accel}/pool.h             | 0
 libgomp/config/{nvptx => accel}/proc.c             | 0
 libgomp/config/{nvptx => accel}/ptrlock.c          | 0
 libgomp/config/{nvptx => accel}/ptrlock.h          | 0
 libgomp/config/{nvptx => accel}/sem.c              | 0
 libgomp/config/{nvptx => accel}/sem.h              | 0
 libgomp/config/{nvptx => accel}/thread-stacksize.h | 0
 libgomp/configure.tgt                              | 2 +-
 20 files changed, 1 insertion(+), 1 deletion(-)
 rename libgomp/config/{nvptx => accel}/libgomp-plugin.c (100%)
 rename libgomp/config/{nvptx => accel}/lock.c (100%)
 rename libgomp/config/{nvptx => accel}/mutex.c (100%)
 rename libgomp/config/{nvptx => accel}/mutex.h (100%)
 rename libgomp/config/{nvptx => accel}/oacc-async.c (100%)
 rename libgomp/config/{nvptx => accel}/oacc-cuda.c (100%)
 rename libgomp/config/{nvptx => accel}/oacc-host.c (100%)
 rename libgomp/config/{nvptx => accel}/oacc-init.c (100%)
 rename libgomp/config/{nvptx => accel}/oacc-mem.c (100%)
 rename libgomp/config/{nvptx => accel}/oacc-plugin.c (100%)
 rename libgomp/config/{nvptx => accel}/omp-lock.h (100%)
 rename libgomp/config/{nvptx => accel}/openacc.f90 (100%)
 rename libgomp/config/{nvptx => accel}/pool.h (100%)
 rename libgomp/config/{nvptx => accel}/proc.c (100%)
 rename libgomp/config/{nvptx => accel}/ptrlock.c (100%)
 rename libgomp/config/{nvptx => accel}/ptrlock.h (100%)
 rename libgomp/config/{nvptx => accel}/sem.c (100%)
 rename libgomp/config/{nvptx => accel}/sem.h (100%)
 rename libgomp/config/{nvptx => accel}/thread-stacksize.h (100%)

Comments

Jakub Jelinek Nov. 12, 2019, 1:40 p.m. UTC | #1
On Tue, Nov 12, 2019 at 01:29:10PM +0000, Andrew Stubbs wrote:
> 2019-11-12  Andrew Stubbs  <ams@codesourcery.com>
> 
> 	libgomp/
> 	* configure.tgt (nvptx*-*-*): Add "accel" directory.
> 	* config/nvptx/libgomp-plugin.c: Move ...
> 	* config/accel/libgomp-plugin.c: ... to here.
> 	* config/nvptx/lock.c: Move ...
> 	* config/accel/lock.c: ... to here.
> 	* config/nvptx/mutex.c: Move ...
> 	* config/accel/mutex.c: ... to here.
> 	* config/nvptx/mutex.h: Move ...
> 	* config/accel/mutex.h: ... to here.
> 	* config/nvptx/oacc-async.c: Move ...
> 	* config/accel/oacc-async.c: ... to here.
> 	* config/nvptx/oacc-cuda.c: Move ...
> 	* config/accel/oacc-cuda.c: ... to here.
> 	* config/nvptx/oacc-host.c: Move ...
> 	* config/accel/oacc-host.c: ... to here.
> 	* config/nvptx/oacc-init.c: Move ...
> 	* config/accel/oacc-init.c: ... to here.
> 	* config/nvptx/oacc-mem.c: Move ...
> 	* config/accel/oacc-mem.c: ... to here.
> 	* config/nvptx/oacc-plugin.c: Move ...
> 	* config/accel/oacc-plugin.c: ... to here.
> 	* config/nvptx/omp-lock.h: Move ...
> 	* config/accel/omp-lock.h: ... to here.
> 	* config/nvptx/openacc.f90: Move ...
> 	* config/accel/openacc.f90: ... to here.
> 	* config/nvptx/pool.h: Move ...
> 	* config/accel/pool.h: ... to here.
> 	* config/nvptx/proc.c: Move ...
> 	* config/accel/proc.c: ... to here.
> 	* config/nvptx/ptrlock.c: Move ...
> 	* config/accel/ptrlock.c: ... to here.
> 	* config/nvptx/ptrlock.h: Move ...
> 	* config/accel/ptrlock.h: ... to here.
> 	* config/nvptx/sem.c: Move ...
> 	* config/accel/sem.c: ... to here.
> 	* config/nvptx/sem.h: Move ...
> 	* config/accel/sem.h: ... to here.
> 	* config/nvptx/thread-stacksize.h: Move ...
> 	* config/accel/thread-stacksize.h: ... to here.

Ok, thanks.

	Jakub

Patch
diff mbox series

diff --git a/libgomp/config/nvptx/libgomp-plugin.c b/libgomp/config/accel/libgomp-plugin.c
similarity index 100%
rename from libgomp/config/nvptx/libgomp-plugin.c
rename to libgomp/config/accel/libgomp-plugin.c
diff --git a/libgomp/config/nvptx/lock.c b/libgomp/config/accel/lock.c
similarity index 100%
rename from libgomp/config/nvptx/lock.c
rename to libgomp/config/accel/lock.c
diff --git a/libgomp/config/nvptx/mutex.c b/libgomp/config/accel/mutex.c
similarity index 100%
rename from libgomp/config/nvptx/mutex.c
rename to libgomp/config/accel/mutex.c
diff --git a/libgomp/config/nvptx/mutex.h b/libgomp/config/accel/mutex.h
similarity index 100%
rename from libgomp/config/nvptx/mutex.h
rename to libgomp/config/accel/mutex.h
diff --git a/libgomp/config/nvptx/oacc-async.c b/libgomp/config/accel/oacc-async.c
similarity index 100%
rename from libgomp/config/nvptx/oacc-async.c
rename to libgomp/config/accel/oacc-async.c
diff --git a/libgomp/config/nvptx/oacc-cuda.c b/libgomp/config/accel/oacc-cuda.c
similarity index 100%
rename from libgomp/config/nvptx/oacc-cuda.c
rename to libgomp/config/accel/oacc-cuda.c
diff --git a/libgomp/config/nvptx/oacc-host.c b/libgomp/config/accel/oacc-host.c
similarity index 100%
rename from libgomp/config/nvptx/oacc-host.c
rename to libgomp/config/accel/oacc-host.c
diff --git a/libgomp/config/nvptx/oacc-init.c b/libgomp/config/accel/oacc-init.c
similarity index 100%
rename from libgomp/config/nvptx/oacc-init.c
rename to libgomp/config/accel/oacc-init.c
diff --git a/libgomp/config/nvptx/oacc-mem.c b/libgomp/config/accel/oacc-mem.c
similarity index 100%
rename from libgomp/config/nvptx/oacc-mem.c
rename to libgomp/config/accel/oacc-mem.c
diff --git a/libgomp/config/nvptx/oacc-plugin.c b/libgomp/config/accel/oacc-plugin.c
similarity index 100%
rename from libgomp/config/nvptx/oacc-plugin.c
rename to libgomp/config/accel/oacc-plugin.c
diff --git a/libgomp/config/nvptx/omp-lock.h b/libgomp/config/accel/omp-lock.h
similarity index 100%
rename from libgomp/config/nvptx/omp-lock.h
rename to libgomp/config/accel/omp-lock.h
diff --git a/libgomp/config/nvptx/openacc.f90 b/libgomp/config/accel/openacc.f90
similarity index 100%
rename from libgomp/config/nvptx/openacc.f90
rename to libgomp/config/accel/openacc.f90
diff --git a/libgomp/config/nvptx/pool.h b/libgomp/config/accel/pool.h
similarity index 100%
rename from libgomp/config/nvptx/pool.h
rename to libgomp/config/accel/pool.h
diff --git a/libgomp/config/nvptx/proc.c b/libgomp/config/accel/proc.c
similarity index 100%
rename from libgomp/config/nvptx/proc.c
rename to libgomp/config/accel/proc.c
diff --git a/libgomp/config/nvptx/ptrlock.c b/libgomp/config/accel/ptrlock.c
similarity index 100%
rename from libgomp/config/nvptx/ptrlock.c
rename to libgomp/config/accel/ptrlock.c
diff --git a/libgomp/config/nvptx/ptrlock.h b/libgomp/config/accel/ptrlock.h
similarity index 100%
rename from libgomp/config/nvptx/ptrlock.h
rename to libgomp/config/accel/ptrlock.h
diff --git a/libgomp/config/nvptx/sem.c b/libgomp/config/accel/sem.c
similarity index 100%
rename from libgomp/config/nvptx/sem.c
rename to libgomp/config/accel/sem.c
diff --git a/libgomp/config/nvptx/sem.h b/libgomp/config/accel/sem.h
similarity index 100%
rename from libgomp/config/nvptx/sem.h
rename to libgomp/config/accel/sem.h
diff --git a/libgomp/config/nvptx/thread-stacksize.h b/libgomp/config/accel/thread-stacksize.h
similarity index 100%
rename from libgomp/config/nvptx/thread-stacksize.h
rename to libgomp/config/accel/thread-stacksize.h
diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index b88bf72fe3d..c5ae9a9e39a 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -154,7 +154,7 @@  case "${target}" in
 	;;
 
   nvptx*-*-*)
-	config_path="nvptx"
+	config_path="nvptx accel"
 	;;
 
   *-*-rtems*)