From 94ed47f2e98ca62155a56a486e81215ce38da45d Mon Sep 17 00:00:00 2001 From: Eisuke Kawashima Date: Wed, 28 Aug 2024 20:19:58 +0900 Subject: [PATCH] fix(llvm/**.py): fix comparison to None (#94018) from PEP8 (https://peps.python.org/pep-0008/#programming-recommendations): > Comparisons to singletons like None should always be done with is or is not, never the equality operators. Co-authored-by: Eisuke Kawashima --- llvm/utils/indirect_calls.py | 2 +- llvm/utils/lit/lit/TestRunner.py | 2 +- llvm/utils/lit/lit/util.py | 2 +- llvm/utils/schedcover.py | 2 +- llvm/utils/shuffle_select_fuzz_tester.py | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/llvm/utils/indirect_calls.py b/llvm/utils/indirect_calls.py index 2bdabc8c4d74f14..34d9e8f9422b0b3 100755 --- a/llvm/utils/indirect_calls.py +++ b/llvm/utils/indirect_calls.py @@ -34,7 +34,7 @@ def look_for_indirect(file): if line.startswith(" ") == False: function = line result = re.search("(call|jmp).*\*", line) - if result != None: + if result is not None: # TODO: Perhaps use cxxfilt to demangle functions? print(function) print(line) diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py index b85c3ca3f6309e0..223a6c6e4ca0a29 100644 --- a/llvm/utils/lit/lit/TestRunner.py +++ b/llvm/utils/lit/lit/TestRunner.py @@ -197,7 +197,7 @@ def executeShCmd(cmd, shenv, results, timeout=0): timeout """ # Use the helper even when no timeout is required to make - # other code simpler (i.e. avoid bunch of ``!= None`` checks) + # other code simpler (i.e. avoid bunch of ``is not None`` checks) timeoutHelper = TimeoutHelper(timeout) if timeout > 0: timeoutHelper.startTimer() diff --git a/llvm/utils/lit/lit/util.py b/llvm/utils/lit/lit/util.py index 232ddc9171ad3d6..a2452f5566b7721 100644 --- a/llvm/utils/lit/lit/util.py +++ b/llvm/utils/lit/lit/util.py @@ -408,7 +408,7 @@ def killProcess(): out, err = p.communicate(input=input) exitCode = p.wait() finally: - if timerObject != None: + if timerObject is not None: timerObject.cancel() # Ensure the resulting output is always of string type. diff --git a/llvm/utils/schedcover.py b/llvm/utils/schedcover.py index 41d0359462d197b..caa73b6d6a7478c 100755 --- a/llvm/utils/schedcover.py +++ b/llvm/utils/schedcover.py @@ -25,7 +25,7 @@ def add(instr, model, resource=None): def filter_model(m): global filt if m and filt: - return filt.search(m) != None + return filt.search(m) is not None else: return True diff --git a/llvm/utils/shuffle_select_fuzz_tester.py b/llvm/utils/shuffle_select_fuzz_tester.py index 73bac3c18db141e..f51945b530d3f95 100755 --- a/llvm/utils/shuffle_select_fuzz_tester.py +++ b/llvm/utils/shuffle_select_fuzz_tester.py @@ -157,7 +157,7 @@ def dump(self): ) def calc_value(self): - if self.value != None: + if self.value is not None: print("Trying to calculate the value of a shuffle instruction twice") exit(1) @@ -199,7 +199,7 @@ def dump(self): ) def calc_value(self): - if self.value != None: + if self.value is not None: print("Trying to calculate the value of a select instruction twice") exit(1) @@ -237,7 +237,7 @@ def gen_inputs(ty, num): # In case one of the dimensions (scalar type/number of elements) is provided, # fill the blank dimension and return appropriate Type object. def get_random_type(ty, num_elts): - if ty != None: + if ty is not None: if ty == "i8": is_float = False width = 8 @@ -260,10 +260,10 @@ def get_random_type(ty, num_elts): int_elt_widths = [8, 16, 32, 64] float_elt_widths = [32, 64] - if num_elts == None: + if num_elts is None: num_elts = random.choice(range(2, 65)) - if ty == None: + if ty is None: # 1 for integer type, 0 for floating-point if random.randint(0, 1): is_float = False @@ -388,7 +388,7 @@ def main(): ), "Minimum value greater than maximum." assert args.type in [None, "i8", "i16", "i32", "i64", "f32", "f64"], "Illegal type." assert ( - args.num_elts == None or args.num_elts > 0 + args.num_elts is None or args.num_elts > 0 ), "num_elts must be a positive integer." random.seed(args.seed)