Roll up work on folding, descriptors, runtime, RESHAPE #162

klausler · 2018-08-03T21:29:31Z

Some disconnected changes here related to evaluation and execution. The C++ interface to the ISO standard descriptor is now is much better shape, and can serve to implement a working RESHAPE intrinsic. More to come, but it was past time to checkpoint and merge this work area.

As a readability improvement (I think), I've replaced many instances of return {}; with return std::nullopt; in contexts where the function's type is an instantiation of std::optional<>.

Also, a GNU C++ compiler bug workaround in lib/parser/basic-parsers.h is no longer needed with GNU 8.2.0, and the conditional compilation tests were adjusted accordingly.

tskeith · 2018-08-03T22:28:49Z

lib/evaluate/expression.cc

@@ -471,7 +472,13 @@ template<int KIND>
 auto RealExpr<KIND>::IntPower::FoldScalar(FoldingContext &context,


Why use auto for these functions? They don't seem to obey the "Don't use auto functions unless..." rule.

This is an outlined member function definition whose result type uses the name of a type declared in the class. Written without auto, the result type would have to be something like std::optional<typename RealExpr<KIND>::Scalar>. This is exactly the situation in which the "unless..." exceptional language in the style guide is meant to apply.

tskeith · 2018-08-03T22:39:09Z

lib/evaluate/int-power.h

+  REAL one{REAL::FromInteger(INT{1}).value};
+  ValueWithRealFlags<REAL> result;
+  result.value = one;
+  if (base.IsNotANumber()) {


We seem to be using "NaN" everywhere else, so why not "IsNaN" for this function?
(I know this wasn't added in this change -- sorry.)

I'll rename some of the others to avoid the needless use of an obscure term of art.

…NU 8.2.0.

tskeith · 2018-08-06T15:58:12Z

runtime/descriptor.cc

+            extent) == CFI_SUCCESS);
+  raw_.f18Addendum = addendum;
+  if (addendum) {
+    new (Addendum()) DescriptorAddendum{};


If any of these placement news fail because the expression is nullptr, does that mean there is a bug in the logic of Descriptor? If it could be due to an error in how the client of this class is using it, I think an explicit assertion would be helpful. Otherwise, this is fine.

In this case, Addendum must be non-null, but it can be made more explicitly so.

schweitzpgi · 2018-08-06T16:05:13Z

runtime/type-code.cc

+    case 8: raw_ = CFI_type_int64_t; break;
+    }
+    break;
+  case TypeCategory::Derived: raw_ = CFI_type_struct; break;


clang will warn about missing default cases

It doesn't.

schweitzpgi · 2018-08-06T16:06:20Z

test/evaluate/real.cc

+      {0x40000000, "0x1.0p1"}, {0x3f000000, "0x1.0p-1"},
+      {0x7f7fffff, "0x1.fffffep127"}, {0x00800000, "0x1.0p-126"},
+      {0x00400000, "0x0.8p-127"}, {0x00000001, "0x0.000002p-127"},
+      {0, nullptr}};


Does this project use clang-format?

Yes, unfortunately it sometimes makes a mess of the code.

In this case, adding a comma after {0, nullptr} would get it back the way it was. I think that would be an improvement.

tskeith

Looks good

Original-commit: flang-compiler/f18@2dc2c2a Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@6f1ef45 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@90e5563 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@77ed88d Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@5adc208 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@5e68ebe Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@b4423e3 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@0ab1704 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@7863350 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

…gory. Original-commit: flang-compiler/f18@5012e65 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@f583987 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

…d with GNU 8.2.0. Original-commit: flang-compiler/f18@80257ee Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@c20ce35 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@0c946be Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@34eac17 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@720e71c Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

Original-commit: flang-compiler/f18@a98942e Reviewed-on: flang-compiler/f18#162

klausler requested review from sscalpone, tskeith and schweitzpgi August 3, 2018 21:29

tskeith reviewed Aug 3, 2018

View reviewed changes

klausler force-pushed the pmk0 branch from 7abf0e5 to 34e07d6 Compare August 3, 2018 22:41

klausler added 15 commits August 3, 2018 16:23

fold real**int

2dc2c2a

COMPLEX folding

6f1ef45

Use std::nullopt in place of empty braces in return statements.

90e5563

complex and character comparisons

77ed88d

character folding

5adc208

checkpoint work on descriptors

5e68ebe

comments

b4423e3

more descriptor work

0ab1704

break up runtime into multiple headers and source files

7863350

Use a common enum class in evaluate and runtime for type category.

5012e65

Move descriptor flags into addendum.

f583987

Implement and test RESHAPE. Avoid G++ workaround when compiled with G…

80257ee

…NU 8.2.0.

test and debug RESHAPE

c20ce35

clean up g++ 8.2.0 build warnings

0c946be

Rename some NaNs.

34eac17

klausler force-pushed the pmk0 branch from 737b142 to 34eac17 Compare August 3, 2018 23:24

Remove defined assignments from runtime representation.

720e71c

tskeith reviewed Aug 6, 2018

View reviewed changes

schweitzpgi reviewed Aug 6, 2018

View reviewed changes

tskeith approved these changes Aug 6, 2018

View reviewed changes

address review comments

a98942e

klausler merged commit 967a334 into master Aug 6, 2018

klausler deleted the pmk0 branch August 6, 2018 16:54

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] fold real**int

a5eb4f9

Original-commit: flang-compiler/f18@2dc2c2a Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] COMPLEX folding

0fc4910

Original-commit: flang-compiler/f18@6f1ef45 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] complex and character comparisons

870d298

Original-commit: flang-compiler/f18@77ed88d Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] character folding

3c6a3f9

Original-commit: flang-compiler/f18@5adc208 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] checkpoint work on descriptors

2bac1c4

Original-commit: flang-compiler/f18@5e68ebe Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] comments

5617286

Original-commit: flang-compiler/f18@b4423e3 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] more descriptor work

0d97a4b

Original-commit: flang-compiler/f18@0ab1704 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] break up runtime into multiple headers and source files

a300f96

Original-commit: flang-compiler/f18@7863350 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] Move descriptor flags into addendum.

6a416da

Original-commit: flang-compiler/f18@f583987 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] test and debug RESHAPE

9521159

Original-commit: flang-compiler/f18@c20ce35 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] clean up g++ 8.2.0 build warnings

4acb9ce

Original-commit: flang-compiler/f18@0c946be Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] Rename some NaNs.

11d01a5

Original-commit: flang-compiler/f18@34eac17 Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] Remove defined assignments from runtime representation.

d9615bb

Original-commit: flang-compiler/f18@720e71c Reviewed-on: flang-compiler/f18#162 Tree-same-pre-rewrite: false

mem-frob pushed a commit to draperlaboratory/hope-llvm-project that referenced this pull request Oct 7, 2022

[flang] address review comments

a203b88

Original-commit: flang-compiler/f18@a98942e Reviewed-on: flang-compiler/f18#162

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Roll up work on folding, descriptors, runtime, RESHAPE #162

Roll up work on folding, descriptors, runtime, RESHAPE #162

Uh oh!

klausler commented Aug 3, 2018 •

edited

Loading

Uh oh!

tskeith Aug 3, 2018

Uh oh!

klausler Aug 3, 2018

Uh oh!

tskeith Aug 3, 2018

Uh oh!

klausler Aug 3, 2018

Uh oh!

tskeith Aug 6, 2018

Uh oh!

klausler Aug 6, 2018

Uh oh!

schweitzpgi Aug 6, 2018

Uh oh!

klausler Aug 6, 2018

Uh oh!

schweitzpgi Aug 6, 2018

Uh oh!

tskeith Aug 6, 2018

Uh oh!

klausler Aug 6, 2018

Uh oh!

tskeith left a comment

Uh oh!

Uh oh!

		@@ -471,7 +472,13 @@ template<int KIND>
		auto RealExpr<KIND>::IntPower::FoldScalar(FoldingContext &context,

Roll up work on folding, descriptors, runtime, RESHAPE #162

Roll up work on folding, descriptors, runtime, RESHAPE #162

Uh oh!

Conversation

klausler commented Aug 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tskeith left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

klausler commented Aug 3, 2018 •

edited

Loading