Rename gas -> ergs in context.* mnemonics

matter-labs · Mar 19, 2024 · 3fc0963 · 3fc0963
1 parent 14c92b2
commit 3fc0963
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/llvm/lib/Target/EraVM/EraVMOpcodes.td b/llvm/lib/Target/EraVM/EraVMOpcodes.td
@@ -149,11 +149,11 @@ def OpContextThis              : EraVMOpcode<"context.this",             1040, D
 def OpContextCaller            : EraVMOpcode<"context.caller",           1041, DirectEncoding>;
 def OpContextCodeAddress       : EraVMOpcode<"context.code_source",      1042, DirectEncoding>;
 def OpContextMeta              : EraVMOpcode<"context.meta",             1043, DirectEncoding>;
-def OpContextErgsLeft          : EraVMOpcode<"context.gas_left",         1044, DirectEncoding>;
+def OpContextErgsLeft          : EraVMOpcode<"context.ergs_left",        1044, DirectEncoding>;
 def OpContextSp                : EraVMOpcode<"context.sp",               1045, DirectEncoding>;
 def OpContextGetContextU128    : EraVMOpcode<"context.get_context_u128", 1046, DirectEncoding>;
 def OpContextSetContextU128    : EraVMOpcode<"context.set_context_u128", 1047, DirectEncoding>;
-def OpContextSetErgsPerPubdataByte   : EraVMOpcode<"context.set_gas_per_pubdata",    1048, DirectEncoding>;
+def OpContextSetErgsPerPubdataByte   : EraVMOpcode<"context.set_ergs_per_pubdata",    1048, DirectEncoding>;
 def OpContextIncrementTxNumber : EraVMOpcode<"context.inc_tx_num",       1049, DirectEncoding>;
 
 // aliased as log.sread

diff --git a/llvm/test/CodeGen/EraVM/gasleft-no-sink.ll b/llvm/test/CodeGen/EraVM/gasleft-no-sink.ll
@@ -9,12 +9,12 @@ define i256 @no_sink(i1 %cond) {
 ; CHECK-NEXT:   jump.eq @.BB0_2
 ; CHECK:        add 2, r0, r1
 ; CHECK-NEXT:   st.2 3, r1
-; CHECK-NEXT:   context.gas_left r1
+; CHECK-NEXT:   context.ergs_left r1
 ; CHECK-NEXT:   jump @.BB0_3
 ; CHECK:       .BB0_2:
 ; CHECK:        add 2, r0, r1
 ; CHECK-NEXT:   st.1 2, r1
-; CHECK-NEXT:   context.gas_left r1
+; CHECK-NEXT:   context.ergs_left r1
 ; CHECK:       .BB0_3:
 ; CHECK:        ret
 ;

diff --git a/llvm/test/CodeGen/EraVM/intrinsic.ll b/llvm/test/CodeGen/EraVM/intrinsic.ll
@@ -60,7 +60,7 @@ define i256 @txoriginr() {
 
 ; CHECK-LABEL: gasleftr
 define i256 @gasleftr() {
-; CHECK: context.gas_left r1
+; CHECK: context.ergs_left r1
   %res = call i256 @llvm.eravm.gasleft()
   ret i256 %res
 }
@@ -88,7 +88,7 @@ define void @inctx() {
 
 ; CHECK-LABEL: setprice
 define void @setprice(i256 %p) {
-; CHECK: context.set_gas_per_pubdata
+; CHECK: context.set_ergs_per_pubdata
   call void @llvm.eravm.setpubdataprice(i256 %p)
   ret void
 }

diff --git a/llvm/test/MC/EraVM/asm-parser/misc.s b/llvm/test/MC/EraVM/asm-parser/misc.s
@@ -6,31 +6,27 @@
   context.this                  r3
   context.caller                r3
   context.code_source           r3
-  // FIXME context.ergs_left             r3
-  context.gas_left              r3
+  context.ergs_left             r3
   context.sp                    r3
   context.get_context_u128      r3
   context.set_context_u128      r3
   context.meta                  r3
   context.inc_tx_num
-  // FIXME context.set_ergs_per_pubdata  r3
-  context.set_gas_per_pubdata   r3
+  context.set_ergs_per_pubdata  r3
 
 // modifiers (condition)
   // FIXME log.precompile.lt  r3, r4, r5
   precompile.lt  r3, r4, r5
   context.this.lt                  r3
   context.caller.lt                r3
   context.code_source.lt           r3
-  // FIXME context.ergs_left.lt             r3
-  context.gas_left.lt              r3
+  context.ergs_left.lt             r3
   context.sp.lt                    r3
   context.get_context_u128.lt      r3
   context.set_context_u128.lt      r3
   context.meta.lt                  r3
   context.inc_tx_num.lt
-  // FIXME context.set_ergs_per_pubdata.lt  r3
-  context.set_gas_per_pubdata.lt   r3
+  context.set_ergs_per_pubdata.lt  r3
 
 
 // COM: Autogenerated checks below, see README.md.
@@ -40,22 +36,22 @@
 // CHECK:  context.this r3
 // CHECK:  context.caller       r3
 // CHECK:  context.code_source  r3
-// CHECK:  context.gas_left     r3
+// CHECK:  context.ergs_left    r3
 // CHECK:  context.sp   r3
 // CHECK:  context.get_context_u128     r3
 // CHECK:  context.set_context_u128     r3
 // CHECK:  context.meta r3
 // CHECK:  context.inc_tx_num
-// CHECK:  context.set_gas_per_pubdata  r3
+// CHECK:  context.set_ergs_per_pubdata  r3
 
 // CHECK:  precompile.lt        r3, r4, r5
 // CHECK:  context.this.lt      r3
 // CHECK:  context.caller.lt    r3
 // CHECK:  context.code_source.lt       r3
-// CHECK:  context.gas_left.lt  r3
+// CHECK:  context.ergs_left.lt  r3
 // CHECK:  context.sp.lt        r3
 // CHECK:  context.get_context_u128.lt  r3
 // CHECK:  context.set_context_u128.lt  r3
 // CHECK:  context.meta.lt      r3
 // CHECK:  context.inc_tx_num.lt
-// CHECK:  context.set_gas_per_pubdata.lt       r3
+// CHECK:  context.set_ergs_per_pubdata.lt       r3