[gcc r12-3125] nvptx: Add a __PTX_SM__ predefined macro based on target ISA.

[gcc r12-3125] nvptx: Add a __PTX_SM__ predefined macro based on target ISA.

[Roger Sayle]

https://gcc.gnu.org/g:3c496e92d795a8fe5c527e3c5b5a6606669ae50d

commit r12-3125-g3c496e92d795a8fe5c527e3c5b5a6606669ae50d
Author: Roger Sayle <roger@nextmovesoftware.com>
Date:   Tue Aug 24 18:02:18 2021 +0100

    nvptx: Add a __PTX_SM__ predefined macro based on target ISA.
    
    This patch adds a __PTX_SM__ predefined macro to the nvptx backend that
    allows code to check the compute model being targeted by the compiler.
    This is equivalent to the __CUDA_ARCH__ macro defined by CUDA's nvcc
    compiler, but to avoid causing problems for source code that checks
    for that compiler, this macro uses GCC's nomenclature; it's easy
    enough for users to "#define __CUDA_ARCH__ __PTX_SM__".
    
    What might have been a four line patch is actually a little more
    complicated, as this patch takes the opportunity to upgrade the
    nvptx backend to use the now preferred nvptx-c.c idiom.
    
    2021-08-24  Roger Sayle  <roger@nextmovesoftware.com>
                Tom de Vries  <tdevries@suse.de>
    
    gcc/ChangeLog
            * config.gcc (nvptx-*-*): Define {c,c++}_target_objs.
            * config/nvptx/nvptx-protos.h (nvptx_cpu_cpp_builtins): Prototype.
            * config/nvptx/nvptx.h (TARGET_CPU_CPP_BUILTINS): Implement with
            a call to the new nvptx_cpu_cpp_builtins function in nvptx-c.c.
            * config/nvptx/t-nvptx (nvptx-c.o): New rule.
            * config/nvptx/nvptx-c.c: New source file.
            (nvptx_cpu_cpp_builtins): Move implementation here.

Diff:
---
 gcc/config.gcc                  |  2 ++
 gcc/config/nvptx/nvptx-c.c      | 47 +++++++++++++++++++++++++++++++++++++++++
 gcc/config/nvptx/nvptx-protos.h |  1 +
 gcc/config/nvptx/nvptx.h        | 12 +----------
 gcc/config/nvptx/t-nvptx        |  4 ++++
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 94199d7407b..0ff5cac1594 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -468,6 +468,8 @@ nios2-*-*)
 	;;
 nvptx-*-*)
 	cpu_type=nvptx
+	c_target_objs="nvptx-c.o"
+	cxx_target_objs="nvptx-c.o"
 	;;
 or1k*-*-*)
 	cpu_type=or1k
diff --git a/gcc/config/nvptx/nvptx-c.c b/gcc/config/nvptx/nvptx-c.c
new file mode 100644
index 00000000000..72594a82e38
--- /dev/null
+++ b/gcc/config/nvptx/nvptx-c.c
@@ -0,0 +1,47 @@
+/* Subroutines for the C front end on the NVPTX architecture.
+ * Copyright (C) 2021 Free Software Foundation, Inc.
+ *
+ * This file is part of GCC.
+ *
+ * GCC is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GCC 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 General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GCC; see the file COPYING3.  If not see
+ * <http://www.gnu.org/licenses/>.  */
+
+#define IN_TARGET_CODE 1
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "target.h"
+#include "c-family/c-common.h"
+#include "memmodel.h"
+#include "tm_p.h"
+#include "c-family/c-pragma.h"
+
+/* Function to tell the preprocessor about the defines for the target.  */
+void
+nvptx_cpu_cpp_builtins (void)
+{
+  cpp_assert (parse_in, "machine=nvptx");
+  cpp_assert (parse_in, "cpu=nvptx");
+  cpp_define (parse_in, "__nvptx__");
+  if (TARGET_SOFT_STACK)
+    cpp_define (parse_in, "__nvptx_softstack__");
+  if (TARGET_UNIFORM_SIMT)
+    cpp_define (parse_in,"__nvptx_unisimt__");
+  if (TARGET_SM35)
+    cpp_define (parse_in, "__PTX_SM__=350");
+  else
+    cpp_define (parse_in,"__PTX_SM__=300");
+}
+
diff --git a/gcc/config/nvptx/nvptx-protos.h b/gcc/config/nvptx/nvptx-protos.h
index b7e6ae26522..b29ddc9d6b8 100644
--- a/gcc/config/nvptx/nvptx-protos.h
+++ b/gcc/config/nvptx/nvptx-protos.h
@@ -40,6 +40,7 @@ extern void nvptx_output_aligned_decl (FILE *file, const char *name,
 extern void nvptx_function_end (FILE *);
 extern void nvptx_output_skip (FILE *, unsigned HOST_WIDE_INT);
 extern void nvptx_output_ascii (FILE *, const char *, unsigned HOST_WIDE_INT);
+extern void nvptx_cpu_cpp_builtins (void);
 extern void nvptx_register_pragmas (void);
 extern unsigned int nvptx_data_alignment (const_tree, unsigned int);
 
diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h
index fdaacdd72d8..d367174f597 100644
--- a/gcc/config/nvptx/nvptx.h
+++ b/gcc/config/nvptx/nvptx.h
@@ -34,17 +34,7 @@
    nvptx-as.  */
 #define ASM_SPEC "%{misa=*:-m %*; :-m sm_35}"
 
-#define TARGET_CPU_CPP_BUILTINS()		\
-  do						\
-    {						\
-      builtin_assert ("machine=nvptx");		\
-      builtin_assert ("cpu=nvptx");		\
-      builtin_define ("__nvptx__");		\
-      if (TARGET_SOFT_STACK)			\
-        builtin_define ("__nvptx_softstack__");	\
-      if (TARGET_UNIFORM_SIMT)			\
-        builtin_define ("__nvptx_unisimt__");	\
-    } while (0)
+#define TARGET_CPU_CPP_BUILTINS() nvptx_cpu_cpp_builtins ()
 
 /* Avoid the default in ../../gcc.c, which adds "-pthread", which is not
    supported for nvptx.  */
diff --git a/gcc/config/nvptx/t-nvptx b/gcc/config/nvptx/t-nvptx
index 6c1010ddd66..d33bacd785d 100644
--- a/gcc/config/nvptx/t-nvptx
+++ b/gcc/config/nvptx/t-nvptx
@@ -1,3 +1,7 @@
+nvptx-c.o: $(srcdir)/config/nvptx/nvptx-c.c
+	$(COMPILE) $<
+	$(POSTCOMPILE)
+
 CFLAGS-mkoffload.o += $(DRIVER_DEFINES) \
 	-DGCC_INSTALL_NAME=\"$(GCC_INSTALL_NAME)\"
 mkoffload.o: $(srcdir)/config/nvptx/mkoffload.c