Address review comments

Signed-off-by: Medha Tiwari <medhatiwari@ibm.com>

Author: medhatiwari

clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp

@@ -586,13 +586,11 @@ mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID,
     // this mask split into two 32-bit registers: EDX (high 32 bits) and
     // EAX (low 32 bits).
     mlir::Type i32Ty = builder.getSInt32Ty();
-    mlir::Type i64Ty = builder.getSInt64Ty();
 
     // Mhi = (uint32_t)(ops[1] >> 32) - extract high 32 bits via right shift
-    cir::ConstantOp shift32 =
-        builder.getConstant(loc, cir::IntAttr::get(i64Ty, 32));
-    mlir::Value mhi =
-        builder.createShift(loc, ops[1], shift32.getResult(), /*isRight=*/true);
+    cir::ConstantOp shift32 = builder.getSInt64(32, loc);
+    mlir::Value mhi = builder.createShift(loc, ops[1], shift32.getResult(),
+                                          /*isShiftLeft=*/false);
     mhi = builder.createIntCast(mhi, i32Ty);
 
     // Mlo = (uint32_t)ops[1] - extract low 32 bits by truncation

clang/test/CIR/CodeGenBuiltins/X86/xsave-builtins.c

@@ -7,10 +7,17 @@
 
 void test_xsave(void *p, unsigned long long m) {
   // CIR-LABEL: test_xsave
+  // CIR: cir.const #cir.int<32> : !s64i
+  // CIR: cir.shift(right, {{.*}} : !u64i, {{.*}} : !s64i) -> !u64i
+  // CIR: cir.cast integral %{{.*}} : !u64i -> !s32i
+  // CIR: cir.cast integral %{{.*}} : !u64i -> !s32i
   // CIR: cir.call_llvm_intrinsic "x86.xsave"
 
   // LLVM-LABEL: test_xsave
-  // LLVM: call void @llvm.x86.xsave
+  // LLVM: lshr i64 {{.*}}, 32
+  // LLVM: trunc i64 {{.*}} to i32
+  // LLVM: trunc i64 {{.*}} to i32
+  // LLVM: call void @llvm.x86.xsave(ptr {{.*}}, i32 {{.*}}, i32 {{.*}})
 
   // OGCG-LABEL: test_xsave
   // OGCG: call void @llvm.x86.xsave