merge main into amd-staging (llvm#3542)

Author: z1_cciauto

clang/lib/Headers/avx512fintrin.h

@@ -180,9 +180,9 @@ typedef enum
 #define __DEFAULT_FN_ATTRS512_CONSTEXPR __DEFAULT_FN_ATTRS512 constexpr
 #define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128 constexpr
 #else
-#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS128
+#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS
 #define __DEFAULT_FN_ATTRS512_CONSTEXPR __DEFAULT_FN_ATTRS512
-#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS
+#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128
 #endif
 
 /* Create vectors with repeated elements */

clang/lib/Headers/avxintrin.h

@@ -70,8 +70,8 @@ typedef __bf16 __m256bh __attribute__((__vector_size__(32), __aligned__(32)));
 #define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS constexpr
 #define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128 constexpr
 #else
-#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS128
-#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS
+#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS
+#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128
 #endif
 
 /* Arithmetic */

cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py

@@ -635,7 +635,7 @@ def launch(self, cmdline):
     def _post_step_hook(self):
         """Hook to be executed after completing a step request."""
 
-    def step(self):
+    def step_in(self):
         self._flush_breakpoints()
         step_req_id = self.send_message(
             self.make_request("stepIn", {"threadId": self._debugger_state.thread})

cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerBase.py

@@ -184,7 +184,7 @@ def launch(self):
         pass
 
     @abc.abstractmethod
-    def step(self):
+    def step_in(self):
         pass
 
     @abc.abstractmethod

cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerControllers/DefaultController.py

@@ -128,7 +128,7 @@ def _run_debugger_custom(self, cmdline):
                     break
 
             if in_source_file(self.source_files, step_info):
-                self.debugger.step()
+                self.debugger.step_in()
             else:
                 self.debugger.go()
 

cross-project-tests/debuginfo-tests/dexter/dex/debugger/dbgeng/dbgeng.py

@@ -111,7 +111,7 @@ def launch(self, cmdline):
         # We are, by this point, already launched.
         self.step_info = probe_process.probe_state(self.client)
 
-    def step(self):
+    def step_in(self):
         res = setup.step_once(self.client)
         if not res:
             self.finished = True
@@ -122,7 +122,7 @@ def go(self):
         # relevant source file -- this is likely to be a problem when setting
         # breakpoints. Until that's fixed, single step instead of running
         # freely. This isn't very efficient, but at least makes progress.
-        self.step()
+        self.step_in()
 
     def _get_step_info(self, watches, step_index):
         frames = self.step_info

cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py

@@ -204,7 +204,7 @@ def launch(self, cmdline):
         assert num_stopped_threads > 0
         assert self._thread, (self._process, self._thread)
 
-    def step(self):
+    def step_in(self):
         self._thread.StepInto()
         stop_reason = self._thread.GetStopReason()
         # If we (1) completed a step and (2) are sitting at a breakpoint,

cross-project-tests/debuginfo-tests/dexter/dex/debugger/visualstudio/VisualStudio.py

@@ -308,7 +308,7 @@ def launch(self, cmdline):
         self.context.logger.note("Launching VS debugger...")
         self._fn_go(False)
 
-    def step(self):
+    def step_in(self):
         self._fn_step(False)
 
     def go(self) -> ReturnCode:

libclc/clc/include/clc/clcfunc.h

@@ -12,6 +12,7 @@
 #define _CLC_OVERLOAD __attribute__((overloadable))
 #define _CLC_DECL
 #define _CLC_INLINE __attribute__((always_inline)) inline
+#define _CLC_CONST __attribute__((const))
 
 // avoid inlines for SPIR-V related targets since we'll optimise later in the
 // chain

libclc/clc/include/clc/common/clc_smoothstep.inc

@@ -6,6 +6,5 @@
 //
 //===----------------------------------------------------------------------===//
 
-_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_smoothstep(__CLC_GENTYPE edge0,
-                                                       __CLC_GENTYPE edge1,
-                                                       __CLC_GENTYPE x);
+_CLC_OVERLOAD _CLC_CONST _CLC_DECL __CLC_GENTYPE
+__clc_smoothstep(__CLC_GENTYPE edge0, __CLC_GENTYPE edge1, __CLC_GENTYPE x);