diff mbox series

[v4,1/4] LoongArch: Merge template got_load_tls_{ld/gd/le/ie}.

Message ID 20240126073745.13252-2-chenglulu@loongson.cn
State New
Headers
Series When cmodel=extreme, add macro support and only support macros. |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Testing passed

Commit Message

Lulu Cheng Jan. 26, 2024, 7:37 a.m. UTC 
  gcc/ChangeLog:

	* config/loongarch/loongarch.cc (loongarch_load_tls):
	Load all types of tls symbols through one function.
	(loongarch_got_load_tls_gd): Delete.
	(loongarch_got_load_tls_ld): Delete.
	(loongarch_got_load_tls_ie): Delete.
	(loongarch_got_load_tls_le): Delete.
	(loongarch_call_tls_get_addr): Modify the called function name.
	(loongarch_legitimize_tls_address): Likewise.
	* config/loongarch/loongarch.md (@got_load_tls_gd<mode>): Delete.
	(@load_tls<mode>): New template.
	(@got_load_tls_ld<mode>): Delete.
	(@got_load_tls_le<mode>): Delete.
	(@got_load_tls_ie<mode>): Delete.
---
 gcc/config/loongarch/loongarch.cc | 47 +++++-------------------
 gcc/config/loongarch/loongarch.md | 59 ++++++++++++-------------------
 2 files changed, 30 insertions(+), 76 deletions(-)

Comments

Xi Ruoyao Jan. 26, 2024, 8:52 a.m. UTC | #1 
On Fri, 2024-01-26 at 15:37 +0800, Lulu Cheng wrote:

> +(define_insn "@load_tls<mode>"
>    [(set (match_operand:P 0 "register_operand" "=r")
>  	(unspec:P
>  	    [(match_operand:P 1 "symbolic_operand" "")]
> -	    UNSPEC_TLS_GD))]
> +	    UNSPEC_TLS))]

/* snip */

> +{
> +  enum loongarch_symbol_type symbol_type;
> +  gcc_assert (loongarch_symbolic_constant_p (operands[1],
> &symbol_type));

/* snip */

> +  switch (symbol_type)
> +    {
> +    case SYMBOL_TLS_LE:
> +      return "la.tls.le\t%0,%1";
> +    case SYMBOL_TLS_IE:
> +      return "la.tls.ie\t%0,%1";
> +    case SYMBOL_TLSLDM:
> +      return "la.tls.ld\t%0,%1";
> +    case SYMBOL_TLSGD:
> +      return "la.tls.gd\t%0,%1";

/* snip */

> +    default:
> +      gcc_unreachable ();
> +    }
> +}
> +  [(set_attr "mode" "<MODE>")
> +   (set_attr "length" "2")])

Should be 8, it's in bytes.
Lulu Cheng Jan. 26, 2024, 8:59 a.m. UTC | #2 
在 2024/1/26 下午4:52, Xi Ruoyao 写道:
> On Fri, 2024-01-26 at 15:37 +0800, Lulu Cheng wrote:
>
>> +(define_insn "@load_tls<mode>"
>>     [(set (match_operand:P 0 "register_operand" "=r")
>>   	(unspec:P
>>   	    [(match_operand:P 1 "symbolic_operand" "")]
>> -	    UNSPEC_TLS_GD))]
>> +	    UNSPEC_TLS))]
> /* snip */
>
>> +{
>> +  enum loongarch_symbol_type symbol_type;
>> +  gcc_assert (loongarch_symbolic_constant_p (operands[1],
>> &symbol_type));
> /* snip */
>
>> +  switch (symbol_type)
>> +    {
>> +    case SYMBOL_TLS_LE:
>> +      return "la.tls.le\t%0,%1";
>> +    case SYMBOL_TLS_IE:
>> +      return "la.tls.ie\t%0,%1";
>> +    case SYMBOL_TLSLDM:
>> +      return "la.tls.ld\t%0,%1";
>> +    case SYMBOL_TLSGD:
>> +      return "la.tls.gd\t%0,%1";
> /* snip */
>
>> +    default:
>> +      gcc_unreachable ();
>> +    }
>> +}
>> +  [(set_attr "mode" "<MODE>")
>> +   (set_attr "length" "2")])
> Should be 8, it's in bytes.
>
Um, sorry, I meant to use insn_count.
Lulu Cheng Jan. 26, 2024, 9:18 a.m. UTC | #3 
在 2024/1/26 下午4:59, chenglulu 写道:
>
> 在 2024/1/26 下午4:52, Xi Ruoyao 写道:
>> On Fri, 2024-01-26 at 15:37 +0800, Lulu Cheng wrote:
>>
>>> +(define_insn "@load_tls<mode>"
>>>     [(set (match_operand:P 0 "register_operand" "=r")
>>>       (unspec:P
>>>           [(match_operand:P 1 "symbolic_operand" "")]
>>> -        UNSPEC_TLS_GD))]
>>> +        UNSPEC_TLS))]
>> /* snip */
>>
>>> +{
>>> +  enum loongarch_symbol_type symbol_type;
>>> +  gcc_assert (loongarch_symbolic_constant_p (operands[1],
>>> &symbol_type));
>> /* snip */
>>
>>> +  switch (symbol_type)
>>> +    {
>>> +    case SYMBOL_TLS_LE:
>>> +      return "la.tls.le\t%0,%1";
>>> +    case SYMBOL_TLS_IE:
>>> +      return "la.tls.ie\t%0,%1";
>>> +    case SYMBOL_TLSLDM:
>>> +      return "la.tls.ld\t%0,%1";
>>> +    case SYMBOL_TLSGD:
>>> +      return "la.tls.gd\t%0,%1";
>> /* snip */
>>
>>> +    default:
>>> +      gcc_unreachable ();
>>> +    }
>>> +}
>>> +  [(set_attr "mode" "<MODE>")
>>> +   (set_attr "length" "2")])
When the symbol type is TLS LE and -mcmodel=extreme, 4 instructions are 
generated here, and I will also modify them here.

>> Should be 8, it's in bytes.
>>
> Um, sorry, I meant to use insn_count.
diff mbox series

Patch

diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc
index dba1252c8f7..2f7de6f94d3 100644
--- a/gcc/config/loongarch/loongarch.cc
+++ b/gcc/config/loongarch/loongarch.cc
@@ -2736,36 +2736,12 @@  loongarch_add_offset (rtx temp, rtx reg, HOST_WIDE_INT offset)
 /* The __tls_get_attr symbol.  */
 static GTY (()) rtx loongarch_tls_symbol;
 
-/* Load an entry from the GOT for a TLS GD access.  */
+/* Load an entry for a TLS access.  */
 
 static rtx
-loongarch_got_load_tls_gd (rtx dest, rtx sym)
+loongarch_load_tls (rtx dest, rtx sym)
 {
-  return gen_got_load_tls_gd (Pmode, dest, sym);
-}
-
-/* Load an entry from the GOT for a TLS LD access.  */
-
-static rtx
-loongarch_got_load_tls_ld (rtx dest, rtx sym)
-{
-  return gen_got_load_tls_ld (Pmode, dest, sym);
-}
-
-/* Load an entry from the GOT for a TLS IE access.  */
-
-static rtx
-loongarch_got_load_tls_ie (rtx dest, rtx sym)
-{
-  return gen_got_load_tls_ie (Pmode, dest, sym);
-}
-
-/* Add in the thread pointer for a TLS LE access.  */
-
-static rtx
-loongarch_got_load_tls_le (rtx dest, rtx sym)
-{
-  return gen_got_load_tls_le (Pmode, dest, sym);
+  return gen_load_tls (Pmode, dest, sym);
 }
 
 /* Return an instruction sequence that calls __tls_get_addr.  SYM is
@@ -2809,14 +2785,7 @@  loongarch_call_tls_get_addr (rtx sym, enum loongarch_symbol_type type, rtx v0)
 	emit_insn (gen_tls_low (Pmode, a0, high, loc));
     }
   else
-    {
-      if (type == SYMBOL_TLSLDM)
-	emit_insn (loongarch_got_load_tls_ld (a0, loc));
-      else if (type == SYMBOL_TLSGD)
-	emit_insn (loongarch_got_load_tls_gd (a0, loc));
-      else
-	gcc_unreachable ();
-    }
+    emit_insn (loongarch_load_tls (a0, loc));
 
   if (flag_plt)
     {
@@ -2953,10 +2922,10 @@  loongarch_legitimize_tls_address (rtx loc)
 	  /* la.tls.ie; tp-relative add.  */
 	  tp = gen_rtx_REG (Pmode, THREAD_POINTER_REGNUM);
 	  tmp1 = gen_reg_rtx (Pmode);
+	  tmp2 = loongarch_unspec_address (loc, SYMBOL_TLS_IE);
 	  dest = gen_reg_rtx (Pmode);
 	  if (la_opt_explicit_relocs != EXPLICIT_RELOCS_NONE)
 	    {
-	      tmp2 = loongarch_unspec_address (loc, SYMBOL_TLS_IE);
 	      tmp3 = gen_reg_rtx (Pmode);
 	      rtx high = gen_rtx_HIGH (Pmode, copy_rtx (tmp2));
 	      high = loongarch_force_temporary (tmp3, high);
@@ -2979,7 +2948,7 @@  loongarch_legitimize_tls_address (rtx loc)
 		emit_insn (gen_ld_from_got (Pmode, tmp1, high, tmp2));
 	    }
 	  else
-	    emit_insn (loongarch_got_load_tls_ie (tmp1, loc));
+	    emit_insn (loongarch_load_tls (tmp1, tmp2));
 	  emit_insn (gen_add3_insn (dest, tmp1, tp));
 	}
       break;
@@ -3011,11 +2980,11 @@  loongarch_legitimize_tls_address (rtx loc)
 
 	  tp = gen_rtx_REG (Pmode, THREAD_POINTER_REGNUM);
 	  tmp1 = gen_reg_rtx (Pmode);
+	  tmp2 = loongarch_unspec_address (loc, SYMBOL_TLS_LE);
 	  dest = gen_reg_rtx (Pmode);
 
 	  if (la_opt_explicit_relocs != EXPLICIT_RELOCS_NONE)
 	    {
-	      tmp2 = loongarch_unspec_address (loc, SYMBOL_TLS_LE);
 	      tmp3 = gen_reg_rtx (Pmode);
 	      rtx high = gen_rtx_HIGH (Pmode, copy_rtx (tmp2));
 	      high = loongarch_force_temporary (tmp3, high);
@@ -3043,7 +3012,7 @@  loongarch_legitimize_tls_address (rtx loc)
 		}
 	    }
 	  else
-	    emit_insn (loongarch_got_load_tls_le (tmp1, loc));
+	    emit_insn (loongarch_load_tls (tmp1, tmp2));
 	  emit_insn (gen_add3_insn (dest, tmp1, tp));
 	}
       break;
diff --git a/gcc/config/loongarch/loongarch.md b/gcc/config/loongarch/loongarch.md
index dda3cdf8be5..0b61b013798 100644
--- a/gcc/config/loongarch/loongarch.md
+++ b/gcc/config/loongarch/loongarch.md
@@ -51,10 +51,7 @@  (define_c_enum "unspec" [
   UNSPEC_BITREV_8B
 
   ;; TLS
-  UNSPEC_TLS_GD
-  UNSPEC_TLS_LD
-  UNSPEC_TLS_LE
-  UNSPEC_TLS_IE
+  UNSPEC_TLS
 
   ;; Stack tie
   UNSPEC_TIE
@@ -2701,45 +2698,33 @@  (define_insn "store_word<mode>"
 
 ;; Thread-Local Storage
 
-(define_insn "@got_load_tls_gd<mode>"
+(define_insn "@load_tls<mode>"
   [(set (match_operand:P 0 "register_operand" "=r")
 	(unspec:P
 	    [(match_operand:P 1 "symbolic_operand" "")]
-	    UNSPEC_TLS_GD))]
+	    UNSPEC_TLS))]
   ""
-  "la.tls.gd\t%0,%1"
-  [(set_attr "got" "load")
-   (set_attr "mode" "<MODE>")])
-
-(define_insn "@got_load_tls_ld<mode>"
-  [(set (match_operand:P 0 "register_operand" "=r")
-	(unspec:P
-	    [(match_operand:P 1 "symbolic_operand" "")]
-	    UNSPEC_TLS_LD))]
-  ""
-  "la.tls.ld\t%0,%1"
-  [(set_attr "got" "load")
-   (set_attr "mode" "<MODE>")])
+{
+  enum loongarch_symbol_type symbol_type;
+  gcc_assert (loongarch_symbolic_constant_p (operands[1], &symbol_type));
 
-(define_insn "@got_load_tls_le<mode>"
-  [(set (match_operand:P 0 "register_operand" "=r")
-	(unspec:P
-	    [(match_operand:P 1 "symbolic_operand" "")]
-	    UNSPEC_TLS_LE))]
-  ""
-  "la.tls.le\t%0,%1"
-  [(set_attr "got" "load")
-   (set_attr "mode" "<MODE>")])
+  switch (symbol_type)
+    {
+    case SYMBOL_TLS_LE:
+      return "la.tls.le\t%0,%1";
+    case SYMBOL_TLS_IE:
+      return "la.tls.ie\t%0,%1";
+    case SYMBOL_TLSLDM:
+      return "la.tls.ld\t%0,%1";
+    case SYMBOL_TLSGD:
+      return "la.tls.gd\t%0,%1";
 
-(define_insn "@got_load_tls_ie<mode>"
-  [(set (match_operand:P 0 "register_operand" "=r")
-	(unspec:P
-	    [(match_operand:P 1 "symbolic_operand" "")]
-	    UNSPEC_TLS_IE))]
-  ""
-  "la.tls.ie\t%0,%1"
-  [(set_attr "got" "load")
-   (set_attr "mode" "<MODE>")])
+    default:
+      gcc_unreachable ();
+    }
+}
+  [(set_attr "mode" "<MODE>")
+   (set_attr "length" "2")])
 
 ;; Move operand 1 to the high word of operand 0 using movgr2frh.w, preserving the
 ;; value in the low word.